Updating GitAheadBehind after commit

Author: StanleyGoldman

src/GitHub.Api/Git/RepositoryManager.cs

@@ -35,7 +35,7 @@ public interface IRepositoryManager : IDisposable
         ITask UnlockFile(string file, bool force);
         void UpdateGitLog();
         void UpdateGitStatus();
-        void UpdateGitAheadBehindStatus(string gitRef, string otherRef);
+        void UpdateGitAheadBehindStatus();
         void UpdateLocks();
         int WaitForEvents();
 
@@ -284,17 +284,27 @@ public void UpdateGitStatus()
             }).Start();
         }
 
-        public void UpdateGitAheadBehindStatus(string gitRef, string otherRef)
+        public void UpdateGitAheadBehindStatus()
         {
-            var task = GitClient.AheadBehindStatus(gitRef, otherRef);
-            task = HookupHandlers(task, true, false);
-            task.Then((success, status) =>
+            ConfigBranch? configBranch;
+            ConfigRemote? configRemote;
+            GetCurrentBranchAndRemote(out configBranch, out configRemote);
+
+            if (configBranch.HasValue && configBranch.Value.Remote.HasValue)
             {
-                if (success)
+                var name = configBranch.Value.Name;
+                var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + name : "[None]";
+
+                var task = GitClient.AheadBehindStatus(name, trackingName);
+                task = HookupHandlers(task, true, false);
+                task.Then((success, status) =>
                 {
-                    GitAheadBehindStatusUpdated?.Invoke(status);
-                }
-            }).Start();
+                    if (success)
+                    {
+                        GitAheadBehindStatusUpdated?.Invoke(status);
+                    }
+                }).Start();
+            }
         }
 
         public void UpdateLocks()
@@ -437,6 +447,7 @@ private void WatcherOnRepositoryCommitted()
         {
             Logger.Trace("WatcherOnRepositoryCommitted");
             UpdateGitLog();
+            UpdateGitAheadBehindStatus();
         }
 
         private void WatcherOnRepositoryChanged()
@@ -536,17 +547,7 @@ private void UpdateRemoteBranches()
             Logger.Trace("OnRemoteBranchListUpdated {0} remotes", remotes.Count);
             RemoteBranchesUpdated?.Invoke(remotes, remoteBranches);
 
-            ConfigBranch? configBranch;
-            ConfigRemote? configRemote;
-            GetCurrentBranchAndRemote(out configBranch,out configRemote);
-
-            if (configBranch.HasValue && configBranch.Value.Remote.HasValue)
-            {
-                var name = configBranch.Value.Name;
-                var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + name : "[None]";
-
-                UpdateGitAheadBehindStatus(name, trackingName);
-            }
+            UpdateGitAheadBehindStatus();
         }
 
         private bool disposed;

src/tests/IntegrationTests/Events/RepositoryManagerTests.cs

@@ -171,10 +171,11 @@ await RepositoryManager
                 repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
                 repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
                 repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
+                repositoryManagerEvents.GitAheadBehindStatusUpdated.WaitOne(Timeout).Should().BeTrue();
 
                 repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
                 repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
-                repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
+                repositoryManagerListener.Received().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
                 repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
                 repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
                 repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
@@ -248,10 +249,11 @@ await RepositoryManager
                 repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
                 repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
                 repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
+                repositoryManagerEvents.GitAheadBehindStatusUpdated.WaitOne(Timeout).Should().BeTrue();
 
                 repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
                 repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
-                repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
+                repositoryManagerListener.Received().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
                 repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
                 repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
                 repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);