code_review: PR #2394

- Auto-selecting remote branch when `Tracking remote branch` is enabled should also work for `Create New Branch` mode
- Use `BranchOrTagNameTextBox` instead of `TextBox` for new branch name input control

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

Author: love-linger

src/ViewModels/AddWorktree.cs

@@ -115,7 +115,7 @@ public override async Task<bool> Sure()
             using var lockWatcher = _repo.LockWatcher();
             ProgressDescription = "Adding worktree ...";
 
-            var branchName = _createNewBranch ? _newBranchName : (_selectedBranch?.FriendlyName ?? string.Empty);
+            var branchName = GetBranchName(false);
             var tracking = (_setTrackingBranch && _selectedTrackingBranch != null) ? _selectedTrackingBranch.FriendlyName : string.Empty;
             var log = _repo.CreateLog("Add Worktree");
 
@@ -134,12 +134,37 @@ private void AutoSelectTrackingBranch()
             if (!_setTrackingBranch || RemoteBranches.Count == 0)
                 return;
 
-            var name = string.IsNullOrEmpty(_selectedBranch?.FriendlyName) ? System.IO.Path.GetFileName(_path.TrimEnd('/', '\\')) : _selectedBranch.FriendlyName;
-            var remoteBranch = RemoteBranches.Find(b => b.Name.EndsWith(name, StringComparison.Ordinal));
-            if (remoteBranch == null)
-                remoteBranch = RemoteBranches[0];
+            var name = GetBranchName(true);
+            if (!string.IsNullOrEmpty(name))
+            {
+                var remoteBranch = RemoteBranches.Find(b => b.Name.EndsWith(name, StringComparison.Ordinal));
+                if (remoteBranch != null)
+                {
+                    SelectedTrackingBranch = remoteBranch;
+                    return;
+                }
+            }
+
+            SelectedTrackingBranch = RemoteBranches[0];
+        }
+
+        private string GetBranchName(bool fallback)
+        {
+            do
+            {
+                if (!_createNewBranch)
+                {
+                    if (_selectedBranch != null)
+                        return _selectedBranch.Name;
+
+                    break;
+                }
+
+                if (!string.IsNullOrEmpty(_newBranchName))
+                    return _newBranchName;
+            } while (false);
 
-            SelectedTrackingBranch = remoteBranch;
+            return fallback ? System.IO.Path.GetFileName(_path.TrimEnd('/', '\\')) : string.Empty;
         }
 
         private Repository _repo = null;

src/Views/AddWorktree.axaml

@@ -54,13 +54,13 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.AddWorktree.Name}"/>
-      <TextBox Grid.Row="2" Grid.Column="1"
-               Height="28"
-               CornerRadius="3"
-               Text="{Binding NewBranchName, Mode=TwoWay}"
-               Watermark="{DynamicResource Text.AddWorktree.Name.Placeholder}"
-               IsEnabled="{Binding CreateNewBranch, Mode=OneWay}"
-               IsVisible="{Binding CreateNewBranch, Mode=OneWay}"/>
+      <v:BranchOrTagNameTextBox Grid.Row="2" Grid.Column="1"
+                                Height="28"
+                                VerticalAlignment="Center"
+                                CornerRadius="3"
+                                Text="{Binding NewBranchName, Mode=TwoWay}"
+                                Watermark="{DynamicResource Text.AddWorktree.Name.Placeholder}"
+                                IsVisible="{Binding CreateNewBranch, Mode=OneWay}"/>
       <v:BranchSelector Grid.Row="2" Grid.Column="1"
                         Height="28"
                         VerticalAlignment="Center" HorizontalAlignment="Stretch"