refactor: query branch head after operation finished to avoid branch head mismatch

Signed-off-by: leo <[email protected]>

Author: love-linger

src/ViewModels/Fetch.cs

@@ -80,9 +80,16 @@ public override Task<bool> Sure()
 
                 log.Complete();
 
+                var upstream = _repo.CurrentBranch?.Upstream;
+                var upstreamHead = string.Empty;
+                if (!string.IsNullOrEmpty(upstream))
+                    upstreamHead = new Commands.QueryRevisionByRefName(_repo.FullPath, upstream.Substring(13)).Result();
+
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToBranchDelayed(_repo.CurrentBranch?.Upstream);
+                    if (!string.IsNullOrEmpty(upstreamHead))
+                        _repo.NavigateToCommitDelayed(upstreamHead);
+
                     _repo.MarkFetched();
                     _repo.SetWatcherEnabled(true);
                 });

src/ViewModels/FetchInto.cs

@@ -33,11 +33,14 @@ public override Task<bool> Sure()
             {
                 new Commands.Fetch(_repo.FullPath, Local, Upstream).Use(log).Exec();
                 log.Complete();
+
+                var changedLocalBranchHead = new Commands.QueryRevisionByRefName(_repo.FullPath, Local.Name).Result();
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToBranchDelayed(Upstream.FullName);
+                    _repo.NavigateToCommitDelayed(changedLocalBranchHead);
                     _repo.SetWatcherEnabled(true);
                 });
+
                 return true;
             });
         }

src/ViewModels/Merge.cs

@@ -64,9 +64,10 @@ public override Task<bool> Sure()
                 new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg).Use(log).Exec();
                 log.Complete();
 
+                var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result();
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToBranchDelayed(_repo.CurrentBranch?.FullName);
+                    _repo.NavigateToCommitDelayed(head);
                     _repo.SetWatcherEnabled(true);
                 });
                 return true;

src/ViewModels/Pull.cs

@@ -164,9 +164,10 @@ public override Task<bool> Sure()
 
                 log.Complete();
 
+                var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result();
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToBranchDelayed(_repo.CurrentBranch?.FullName);
+                    _repo.NavigateToCommitDelayed(head);
                     _repo.SetWatcherEnabled(true);
                 });
 

src/ViewModels/Repository.cs

@@ -922,15 +922,15 @@ public void NavigateToCommit(string sha)
             }
         }
 
-        public void NavigateToCurrentHead()
+        public void NavigateToCommitDelayed(string sha)
         {
-            if (_currentBranch != null)
-                NavigateToCommit(_currentBranch.Head);
+            _navigateToCommitDelayed = sha;
         }
 
-        public void NavigateToBranchDelayed(string branch)
+        public void NavigateToCurrentHead()
         {
-            _navigateToBranchDelayed = branch;
+            if (_currentBranch != null)
+                NavigateToCommit(_currentBranch.Head);
         }
 
         public void ClearHistoriesFilter()
@@ -1189,15 +1189,11 @@ public void RefreshCommits()
 
                     BisectState = _histories.UpdateBisectInfo();
 
-                    if (!string.IsNullOrEmpty(_navigateToBranchDelayed))
-                    {
-                        var branch = _branches.Find(x => x.FullName == _navigateToBranchDelayed);
-                        if (branch != null)
-                            NavigateToCommit(branch.Head);
-                    }
+                    if (!string.IsNullOrEmpty(_navigateToCommitDelayed))
+                        NavigateToCommit(_navigateToCommitDelayed);
                 }
 
-                _navigateToBranchDelayed = string.Empty;
+                _navigateToCommitDelayed = string.Empty;
             });
         }
 
@@ -2937,6 +2933,6 @@ private void AutoFetchImpl(object sender)
         private Models.BisectState _bisectState = Models.BisectState.None;
         private bool _isBisectCommandRunning = false;
 
-        private string _navigateToBranchDelayed = string.Empty;
+        private string _navigateToCommitDelayed = string.Empty;
     }
 }