enhance: navigate to upstream head after fetch, pull, and merge (#1180)

Author: gadfly3173

src/Commands/QueryBranches.cs

@@ -40,7 +40,7 @@ public QueryBranches(string repo)
             foreach (var b in branches)
             {
                 if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))
-                    b.IsUpsteamGone = !remoteBranches.Contains(b.Upstream);
+                    b.IsUpstreamGone = !remoteBranches.Contains(b.Upstream);
             }
 
             return branches;
@@ -86,7 +86,7 @@ private Models.Branch ParseLine(string line)
             branch.Head = parts[1];
             branch.IsCurrent = parts[2] == "*";
             branch.Upstream = parts[3];
-            branch.IsUpsteamGone = false;
+            branch.IsUpstreamGone = false;
 
             if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
                 branch.TrackStatus = new QueryTrackStatus(WorkingDirectory, branch.Name, branch.Upstream).Result();

src/Models/Branch.cs

@@ -34,7 +34,7 @@ public class Branch
         public string Upstream { get; set; }
         public BranchTrackStatus TrackStatus { get; set; }
         public string Remote { get; set; }
-        public bool IsUpsteamGone { get; set; }
+        public bool IsUpstreamGone { get; set; }
 
         public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }

src/ViewModels/BranchTreeNode.cs

@@ -44,7 +44,7 @@ public bool IsCurrent
 
         public bool ShowUpstreamGoneTip
         {
-            get => Backend is Models.Branch { IsUpsteamGone: true };
+            get => Backend is Models.Branch { IsUpstreamGone: true };
         }
 
         public string Tooltip

src/ViewModels/FastForwardWithoutCheckout.cs

@@ -32,7 +32,11 @@ public override Task<bool> Sure()
             return Task.Run(() =>
             {
                 new Commands.UpdateRef(_repo.FullPath, Local.FullName, To.FullName, SetProgressDescription).Exec();
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() =>
+                {
+                    _repo.NavigateToCommit(To.Head);
+                    _repo.SetWatcherEnabled(true);
+                });
                 return true;
             });
         }

src/ViewModels/Fetch.cs

@@ -34,14 +34,14 @@ public bool Force
             set => _repo.Settings.EnableForceOnFetch = value;
         }
 
-        public Fetch(Repository repo, Models.Remote preferedRemote = null)
+        public Fetch(Repository repo, Models.Remote preferredRemote = null)
         {
             _repo = repo;
-            _fetchAllRemotes = preferedRemote == null;
+            _fetchAllRemotes = preferredRemote == null;
 
-            if (preferedRemote != null)
+            if (preferredRemote != null)
             {
-                SelectedRemote = preferedRemote;
+                SelectedRemote = preferredRemote;
             }
             else if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
             {
@@ -83,6 +83,7 @@ public override Task<bool> Sure()
 
                 CallUIThread(() =>
                 {
+                    _repo.SetNeedNavigateToUpstreamHead();
                     _repo.MarkFetched();
                     _repo.SetWatcherEnabled(true);
                 });

src/ViewModels/FetchInto.cs

@@ -32,7 +32,11 @@ public override Task<bool> Sure()
             return Task.Run(() =>
             {
                 new Commands.Fetch(_repo.FullPath, Local, Upstream, SetProgressDescription).Exec();
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() =>
+                {
+                    _repo.SetNeedNavigateToUpstreamHead();
+                    _repo.SetWatcherEnabled(true);
+                });
                 return true;
             });
         }

src/ViewModels/Merge.cs

@@ -62,7 +62,22 @@ public override Task<bool> Sure()
             return Task.Run(() =>
             {
                 new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, SetProgressDescription).Exec();
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() =>
+                {
+                    switch (Source)
+                    {
+                        case Models.Branch branch:
+                            _repo.NavigateToCommit(branch.Head);
+                            break;
+                        case Models.Commit commit:
+                            _repo.NavigateToCommit(commit.SHA);
+                            break;
+                        case Models.Tag tag:
+                            _repo.NavigateToCommit(tag.SHA);
+                            break;
+                    }
+                    _repo.SetWatcherEnabled(true);
+                });
                 return true;
             });
         }

src/ViewModels/Pull.cs

@@ -192,7 +192,11 @@ public override Task<bool> Sure()
                     rs = new Commands.Stash(_repo.FullPath).Pop("stash@{0}");
                 }
 
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() =>
+                {
+                    _repo.SetNeedNavigateToUpstreamHead();
+                    _repo.SetWatcherEnabled(true);
+                });
                 return rs;
             });
         }

src/ViewModels/Repository.cs

@@ -717,6 +717,11 @@ public void SetWatcherEnabled(bool enabled)
             _watcher?.SetEnabled(enabled);
         }
 
+        public void SetNeedNavigateToUpstreamHead()
+        {
+            _needNavigateToUpstreamHead = true;
+        }
+
         public void MarkBranchesDirtyManually()
         {
             if (_watcher == null)
@@ -773,6 +778,15 @@ public void NavigateToCurrentHead()
                 NavigateToCommit(_currentBranch.Head);
         }
 
+        public void NavigateToCurrentUpstreamHead()
+        {
+            if (_currentBranch == null || string.IsNullOrEmpty(_currentBranch.Upstream))
+                return;
+            var branch = _branches.Find(x => x.FullName == _currentBranch.Upstream);
+            if (branch != null)
+                NavigateToCommit(branch.Head);
+        }
+
         public void ClearHistoriesFilter()
         {
             _settings.HistoriesFilters.Clear();
@@ -991,6 +1005,11 @@ public void RefreshCommits()
                     _histories.IsLoading = false;
                     _histories.Commits = commits;
                     _histories.Graph = graph;
+                    if (_needNavigateToUpstreamHead)
+                    {
+                        NavigateToCurrentUpstreamHead();
+                        _needNavigateToUpstreamHead = false;
+                    }
                 }
             });
         }
@@ -2588,5 +2607,6 @@ private void AutoFetchImpl(object sender)
         private bool _isAutoFetching = false;
         private Timer _autoFetchTimer = null;
         private DateTime _lastFetchTime = DateTime.MinValue;
+        private bool _needNavigateToUpstreamHead = false;
     }
 }