code_style: cleanup Histories

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/Fetch.cs

@@ -68,7 +68,7 @@ public override async Task<bool> Sure()
         {
             using var lockWatcher = _repo.LockWatcher();
 
-            var navigateToUpstreamHEAD = _repo.SelectedView is Histories { AutoSelectedCommit: { IsCurrentHead: true } };
+            var navigateToUpstreamHEAD = _repo.SelectedView is Histories { SelectedCommit: { IsCurrentHead: true } };
             var notags = _repo.Settings.FetchWithoutTags;
             var force = _repo.Settings.EnableForceOnFetch;
             var log = _repo.CreateLog("Fetch");

src/ViewModels/Histories.cs

@@ -23,11 +23,11 @@ public List<Models.Commit> Commits
             get => _commits;
             set
             {
-                var lastSelected = AutoSelectedCommit;
+                var lastSelected = SelectedCommit;
                 if (SetProperty(ref _commits, value))
                 {
                     if (value.Count > 0 && lastSelected != null)
-                        AutoSelectedCommit = value.Find(x => x.SHA == lastSelected.SHA);
+                        SelectedCommit = value.Find(x => x.SHA == lastSelected.SHA);
                 }
             }
         }
@@ -38,10 +38,10 @@ public Models.CommitGraph Graph
             set => SetProperty(ref _graph, value);
         }
 
-        public Models.Commit AutoSelectedCommit
+        public Models.Commit SelectedCommit
         {
-            get => _autoSelectedCommit;
-            set => SetProperty(ref _autoSelectedCommit, value);
+            get => _selectedCommit;
+            set => SetProperty(ref _selectedCommit, value);
         }
 
         public long NavigationId
@@ -97,7 +97,7 @@ public void Dispose()
             Commits = [];
             _repo = null;
             _graph = null;
-            _autoSelectedCommit = null;
+            _selectedCommit = null;
             _detailContext?.Dispose();
             _detailContext = null;
         }
@@ -138,7 +138,8 @@ public void NavigateTo(string commitSHA)
             var commit = _commits.Find(x => x.SHA.StartsWith(commitSHA, StringComparison.Ordinal));
             if (commit != null)
             {
-                NavigateTo(commit);
+                SelectedCommit = commit;
+                NavigationId = _navigationId + 1;
                 return;
             }
 
@@ -148,12 +149,32 @@ public void NavigateTo(string commitSHA)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 
-                Dispatcher.UIThread.Post(() => NavigateTo(c));
+                Dispatcher.UIThread.Post(() =>
+                {
+                    _ignoreSelectionChange = true;
+                    SelectedCommit = null;
+
+                    if (_detailContext is CommitDetail detail)
+                    {
+                        detail.Commit = c;
+                    }
+                    else
+                    {
+                        var commitDetail = new CommitDetail(_repo, _commitDetailSharedData);
+                        commitDetail.Commit = c;
+                        DetailContext = commitDetail;
+                    }
+
+                    _ignoreSelectionChange = false;
+                });
             });
         }
 
         public void Select(IList commits)
         {
+            if (_ignoreSelectionChange)
+                return;
+
             if (commits.Count == 0)
             {
                 _repo.SearchCommitContext.Selected = null;
@@ -165,7 +186,7 @@ public void Select(IList commits)
                 if (_repo.SearchCommitContext.Selected == null || _repo.SearchCommitContext.Selected.SHA != commit.SHA)
                     _repo.SearchCommitContext.Selected = _repo.SearchCommitContext.Results?.Find(x => x.SHA == commit.SHA);
 
-                AutoSelectedCommit = commit;
+                SelectedCommit = commit;
                 NavigationId = _navigationId + 1;
 
                 if (_detailContext is CommitDetail detail)
@@ -395,40 +416,16 @@ public void CompareWithWorktree(Models.Commit commit)
             DetailContext = new RevisionCompare(_repo.FullPath, commit, null);
         }
 
-        private void NavigateTo(Models.Commit commit)
-        {
-            AutoSelectedCommit = commit;
-
-            if (commit == null)
-            {
-                DetailContext = null;
-            }
-            else
-            {
-                NavigationId = _navigationId + 1;
-
-                if (_detailContext is CommitDetail detail)
-                {
-                    detail.Commit = commit;
-                }
-                else
-                {
-                    var commitDetail = new CommitDetail(_repo, _commitDetailSharedData);
-                    commitDetail.Commit = commit;
-                    DetailContext = commitDetail;
-                }
-            }
-        }
-
         private Repository _repo = null;
         private CommitDetailSharedData _commitDetailSharedData = null;
         private bool _isLoading = true;
         private List<Models.Commit> _commits = new List<Models.Commit>();
         private Models.CommitGraph _graph = null;
-        private Models.Commit _autoSelectedCommit = null;
+        private Models.Commit _selectedCommit = null;
         private Models.Bisect _bisect = null;
         private long _navigationId = 0;
         private IDisposable _detailContext = null;
+        private bool _ignoreSelectionChange = false;
 
         private GridLength _leftArea = new GridLength(1, GridUnitType.Star);
         private GridLength _rightArea = new GridLength(1, GridUnitType.Star);

src/Views/Histories.axaml

@@ -30,7 +30,7 @@
                 Background="{DynamicResource Brush.Window}"
                 SelectionMode="Extended"
                 ItemsSource="{Binding Commits, Mode=OneWay}"
-                SelectedItem="{Binding AutoSelectedCommit, Mode=OneWay}"
+                SelectedItem="{Binding SelectedCommit, Mode=OneWay}"
                 CanUserReorderColumns="False"
                 CanUserResizeColumns="True"
                 CanUserSortColumns="False"