From e430e847ff957e23c9e146197f6ce8690730645e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Mar 2025 09:49:25 +0800
Subject: [PATCH] enhance: auto convert spaces with dashes while renaming a
 branch (#1088)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/RenameBranch.cs | 21 ++++++++++++++++-----
 src/Views/CreateBranch.axaml   | 12 ++----------
 src/Views/RenameBranch.axaml   | 10 +++++++++-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/ViewModels/RenameBranch.cs b/src/ViewModels/RenameBranch.cs
index bd0b4664..0679a5b5 100644
--- a/src/ViewModels/RenameBranch.cs
+++ b/src/ViewModels/RenameBranch.cs
@@ -12,7 +12,7 @@ namespace SourceGit.ViewModels
         }
 
         [Required(ErrorMessage = "Branch name is required!!!")]
-        [RegularExpression(@"^[\w\-/\.#]+$", ErrorMessage = "Bad branch name format!")]
+        [RegularExpression(@"^[\w \-/\.#]+$", ErrorMessage = "Bad branch name format!")]
         [CustomValidation(typeof(RenameBranch), nameof(ValidateBranchName))]
         public string Name
         {
@@ -32,9 +32,10 @@ namespace SourceGit.ViewModels
         {
             if (ctx.ObjectInstance is RenameBranch rename)
             {
+                var fixedName = rename.FixName(name);
                 foreach (var b in rename._repo.Branches)
                 {
-                    if (b.IsLocal && b != rename.Target && b.Name == name)
+                    if (b.IsLocal && b != rename.Target && b.Name == fixedName)
                     {
                         return new ValidationResult("A branch with same name already exists!!!");
                     }
@@ -46,7 +47,8 @@ namespace SourceGit.ViewModels
 
         public override Task<bool> Sure()
         {
-            if (_name == Target.Name)
+            var fixedName = FixName(_name);
+            if (fixedName == Target.Name)
                 return null;
 
             _repo.SetWatcherEnabled(false);
@@ -55,7 +57,7 @@ namespace SourceGit.ViewModels
             return Task.Run(() =>
             {
                 var oldName = Target.FullName;
-                var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, _name);
+                var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, fixedName);
                 CallUIThread(() =>
                 {
                     if (succ)
@@ -65,7 +67,7 @@ namespace SourceGit.ViewModels
                             if (filter.Type == Models.FilterType.LocalBranch &&
                                 filter.Pattern.Equals(oldName, StringComparison.Ordinal))
                             {
-                                filter.Pattern = $"refs/heads/{_name}";
+                                filter.Pattern = $"refs/heads/{fixedName}";
                                 break;
                             }
                         }
@@ -78,6 +80,15 @@ namespace SourceGit.ViewModels
             });
         }
 
+        private string FixName(string name)
+        {
+            if (!name.Contains(' '))
+                return name;
+
+            var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+            return string.Join("-", parts);
+        }
+
         private readonly Repository _repo;
         private string _name;
     }
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index ec56ff20..b757bd78 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -14,15 +14,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.CreateBranch.Title}"/>
-    <Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto"/>
-        <RowDefinition Height="Auto"/>
-        <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,Auto,Auto" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -94,7 +86,7 @@
                        IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         </WrapPanel>
       </Border>
-      
+
       <CheckBox Grid.Row="4" Grid.Column="1"
                 Content="{DynamicResource Text.CreateBranch.Checkout}"
                 IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index 59a849fe..efbbf323 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:v="using:SourceGit.Views"
+             xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RenameBranch"
              x:DataType="vm:RenameBranch">
@@ -11,7 +12,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.RenameBranch}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -32,6 +33,13 @@
                Text="{Binding Name, Mode=TwoWay}"
                Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"
                v:AutoFocusBehaviour.IsEnabled="True"/>
+
+      <StackPanel Grid.Row="2" Grid.Column="1"
+                  Orientation="Horizontal"
+                  IsVisible="{Binding Name, Converter={x:Static c:StringConverters.ContainsSpaces}}">
+        <Path Width="10" Height="10" Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
+        <TextBlock Classes="small" Text="{DynamicResource Text.CreateBranch.Name.WarnSpace}" Margin="4,0,0,0"/>
+      </StackPanel>
     </Grid>
   </StackPanel>
 </UserControl>