enhance: manually update local branch tree after creating a new local branch (#2169)

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

Author: love-linger

src/ViewModels/Checkout.cs

@@ -82,7 +82,7 @@ public override async Task<bool> Sure()
                         .Use(log)
                         .PopAsync("stash@{0}");
 
-                _repo.FastRefreshBranchesAfterCheckout(_branch);
+                _repo.RefreshAfterCheckoutBranch(_branch);
             }
             else
             {

src/ViewModels/CheckoutAndFastForward.cs

@@ -85,7 +85,7 @@ public override async Task<bool> Sure()
                 LocalBranch.Head = RemoteBranch.Head;
                 LocalBranch.CommitterDate = RemoteBranch.CommitterDate;
 
-                _repo.FastRefreshBranchesAfterCheckout(LocalBranch);
+                _repo.RefreshAfterCheckoutBranch(LocalBranch);
             }
             else
             {

src/ViewModels/CreateBranch.cs

@@ -58,6 +58,8 @@ public CreateBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
             _baseOnRevision = branch.Head;
+            _committerDate = branch.CommitterDate;
+            _head = branch.Head;
 
             if (!branch.IsLocal)
                 Name = branch.Name;
@@ -70,6 +72,8 @@ public CreateBranch(Repository repo, Models.Commit commit)
         {
             _repo = repo;
             _baseOnRevision = commit.SHA;
+            _committerDate = commit.CommitterTime;
+            _head = commit.SHA;
 
             BasedOn = commit;
             DiscardLocalChanges = false;
@@ -79,6 +83,8 @@ public CreateBranch(Repository repo, Models.Tag tag)
         {
             _repo = repo;
             _baseOnRevision = tag.SHA;
+            _committerDate = tag.CreatorDate;
+            _head = tag.SHA;
 
             BasedOn = tag;
             DiscardLocalChanges = false;
@@ -125,6 +131,15 @@ public override async Task<bool> Sure()
                 }
             }
 
+            Models.Branch created = new()
+            {
+                Name = _name,
+                FullName = $"refs/heads/{_name}",
+                CommitterDate = _committerDate,
+                Head = _head,
+                IsLocal = true,
+            };
+
             bool succ;
             if (CheckoutAfterCreated && !_repo.IsBare)
             {
@@ -168,43 +183,33 @@ public override async Task<bool> Sure()
                     .CreateAsync(_baseOnRevision, _allowOverwrite);
             }
 
-            if (succ && BasedOn is Models.Branch { IsLocal: false } basedOn && _name.Equals(basedOn.Name, StringComparison.Ordinal))
+            if (succ)
             {
-                await new Commands.Branch(_repo.FullPath, _name)
+                if (BasedOn is Models.Branch { IsLocal: false } basedOn && _name.Equals(basedOn.Name, StringComparison.Ordinal))
+                {
+                    await new Commands.Branch(_repo.FullPath, _name)
                         .Use(log)
                         .SetUpstreamAsync(basedOn);
-            }
-
-            log.Complete();
-
-            if (succ && CheckoutAfterCreated)
-            {
-                var fake = new Models.Branch() { IsLocal = true, FullName = $"refs/heads/{_name}" };
-                if (BasedOn is Models.Branch { IsLocal: false } based)
-                    fake.Upstream = based.FullName;
 
-                var folderEndIdx = fake.FullName.LastIndexOf('/');
-                if (folderEndIdx > 10)
-                    _repo.UIStates.ExpandedBranchNodesInSideBar.Add(fake.FullName.Substring(0, folderEndIdx));
+                    created.Upstream = basedOn.FullName;
+                }
 
-                if (_repo.HistoryFilterMode == Models.FilterMode.Included)
-                    _repo.SetBranchFilterMode(fake, Models.FilterMode.Included, false, false);
+                _repo.RefreshAfterCreateBranch(created, CheckoutAfterCreated);
             }
-
-            _repo.MarkBranchesDirtyManually();
-
-            if (CheckoutAfterCreated)
+            else
             {
-                ProgressDescription = "Waiting for branch updated...";
-                await Task.Delay(400);
+                _repo.MarkWorkingCopyDirtyManually();
             }
 
+            log.Complete();
             return true;
         }
 
         private readonly Repository _repo = null;
-        private string _name = null;
         private readonly string _baseOnRevision = null;
+        private readonly ulong _committerDate = 0;
+        private readonly string _head = string.Empty;
+        private string _name = null;
         private bool _allowOverwrite = false;
     }
 }

src/ViewModels/RenameBranch.cs

@@ -60,7 +60,7 @@ public override async Task<bool> Sure()
                 .RenameAsync(_name);
 
             if (succ)
-                _repo.FastRefreshBranchesAfterRenaming(Target, _name);
+                _repo.RefreshAfterRenameBranch(Target, _name);
 
             log.Complete();
             return succ;

src/ViewModels/Repository.cs

@@ -788,7 +788,54 @@ public IDisposable LockWatcher()
             return _watcher?.Lock();
         }
 
-        public void FastRefreshBranchesAfterCheckout(Models.Branch checkouted)
+        public void RefreshAfterCreateBranch(Models.Branch created, bool checkout)
+        {
+            _watcher?.MarkBranchUpdated();
+            _watcher?.MarkWorkingCopyUpdated();
+
+            _branches.Add(created);
+
+            if (checkout)
+            {
+                if (_currentBranch.IsDetachedHead)
+                {
+                    _branches.Remove(_currentBranch);
+                }
+                else
+                {
+                    _currentBranch.IsCurrent = false;
+                    _currentBranch.WorktreePath = null;
+                }
+
+                created.IsCurrent = true;
+                created.WorktreePath = FullPath;
+
+                var folderEndIdx = created.FullName.LastIndexOf('/');
+                if (folderEndIdx > 10)
+                    _uiStates.ExpandedBranchNodesInSideBar.Add(created.FullName.Substring(0, folderEndIdx));
+
+                if (_historyFilterMode == Models.FilterMode.Included)
+                    SetBranchFilterMode(created, Models.FilterMode.Included, false, false);
+
+                CurrentBranch = created;
+            }
+
+            List<Models.Branch> locals = [];
+            foreach (var b in _branches)
+            {
+                if (b.IsLocal)
+                    locals.Add(b);
+            }
+
+            var builder = BuildBranchTree(locals, []);
+            LocalBranchTrees = builder.Locals;
+
+            RefreshCommits();
+            RefreshWorkingCopyChanges();
+            RefreshWorktrees();
+        }
+
+        public void RefreshAfterCheckoutBranch(Models.Branch checkouted)
         {
             _watcher?.MarkBranchUpdated();
             _watcher?.MarkWorkingCopyUpdated();
@@ -824,7 +871,7 @@ public void FastRefreshBranchesAfterCheckout(Models.Branch checkouted)
             RefreshWorktrees();
         }
 
-        public void FastRefreshBranchesAfterRenaming(Models.Branch b, string newName)
+        public void RefreshAfterRenameBranch(Models.Branch b, string newName)
         {
             _watcher?.MarkBranchUpdated();