feature: support deleting attached worktree while deleting a single branch (#2806)

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

Author: love-linger

src/Resources/Locales/en_US.axaml

@@ -348,6 +348,7 @@
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodule:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Delete Branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.DeleteBranch.DeleteAttachedWorktree" xml:space="preserve">Delete worktree for this branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Force delete even if it contains unmerged commit(s)</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">You are about to delete a remote branch!!!</x:String>
   <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Also delete remote branch ${0}$</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -352,6 +352,7 @@
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模块 ：</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">删除分支确认</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
+  <x:String x:Key="Text.DeleteBranch.DeleteAttachedWorktree" xml:space="preserve">同时删除与使用此分支的工作树</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">强制删除，即使包含未合并的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
   <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">同时删除远程分支 ${0}$</x:String>

src/ViewModels/DeleteBranch.cs

@@ -15,6 +15,11 @@ public Models.Branch Upstream
             get;
         }
 
+        public Worktree AttachedWorktree
+        {
+            get;
+        }
+
         public string DeleteUpstreamTip
         {
             get;
@@ -32,18 +37,39 @@ public bool Force
             set;
         }
 
+        public bool DeleteWorktree
+        {
+            get;
+            set;
+        }
+
         public DeleteBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
             Target = branch;
 
-            if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream))
+            if (branch.IsLocal)
             {
-                var upstream = _repo.Branches.Find(x => x.FullName.Equals(branch.Upstream, StringComparison.Ordinal));
-                if (upstream != null && upstream.Name.Equals(branch.Name, StringComparison.Ordinal))
+                if (!string.IsNullOrEmpty(branch.Upstream))
+                {
+                    var upstream = _repo.Branches.Find(x => x.FullName.Equals(branch.Upstream, StringComparison.Ordinal));
+                    if (upstream != null && upstream.Name.Equals(branch.Name, StringComparison.Ordinal))
+                    {
+                        Upstream = upstream;
+                        DeleteUpstreamTip = App.Text("DeleteBranch.WithTrackingRemote", upstream.FriendlyName);
+                    }
+                }
+
+                if (branch.HasWorktree)
                 {
-                    Upstream = upstream;
-                    DeleteUpstreamTip = App.Text("DeleteBranch.WithTrackingRemote", upstream.FriendlyName);
+                    foreach (var wt in repo.Worktrees)
+                    {
+                        if (wt.IsAttachedTo(branch))
+                        {
+                            AttachedWorktree = wt;
+                            break;
+                        }
+                    }
                 }
             }
         }
@@ -61,6 +87,19 @@ public override async Task<bool> Sure()
             {
                 do
                 {
+                    if (AttachedWorktree != null && DeleteWorktree)
+                    {
+                        succ = await new Commands.Worktree(_repo.FullPath)
+                            .Use(log)
+                            .RemoveAsync(AttachedWorktree.FullPath, Force);
+
+                        if (!succ)
+                        {
+                            log.Complete();
+                            return false;
+                        }
+                    }
+
                     succ = await new Commands.Branch(_repo.FullPath, Target.Name)
                         .Use(log)
                         .DeleteLocalAsync(Force);

src/Views/DeleteBranch.axaml

@@ -18,7 +18,7 @@
                  Text="{DynamicResource Text.DeleteBranch}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto,Auto,Auto" ColumnDefinitions="120,*">
+    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto,Auto,Auto,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
@@ -36,26 +36,29 @@
                      Text="{Binding Target.TrackStatusDescription}"/>
         </Border>
       </StackPanel>
+      
+      <CheckBox Grid.Row="1" Grid.Column="1"
+                Height="32"
+                IsChecked="{Binding DeleteUpstream, Mode=TwoWay}"
+                IsVisible="{Binding Upstream, Mode=OneWay, Converter={x:Static ObjectConverters.IsNotNull}}">
+        <v:NameHighlightedTextBlock Foreground="{DynamicResource Brush.FG1}"
+                                    Text="{Binding DeleteUpstreamTip, Mode=OneWay}"
+                                    VerticalAlignment="Center"/>
+      </CheckBox>
 
-      <Border Grid.Row="1" Grid.Column="1"
-              Height="32"
-              IsVisible="{Binding Target.IsLocal, Mode=OneWay}">
-        <CheckBox Content="{DynamicResource Text.DeleteBranch.Force}"
-                  IsChecked="{Binding Force, Mode=TwoWay}"
-                  ToolTip.Tip="--force"/>
-      </Border>
+      <CheckBox Grid.Row="2" Grid.Column="1"
+                IsChecked="{Binding DeleteWorktree, Mode=TwoWay}"
+                IsVisible="{Binding AttachedWorktree, Mode=OneWay, Converter={x:Static ObjectConverters.IsNotNull}}"
+                Content="{DynamicResource Text.DeleteBranch.DeleteAttachedWorktree}"/>
 
-      <Border Grid.Row="2" Grid.Column="1"
-              Height="32"
-              IsVisible="{Binding Upstream, Mode=OneWay, Converter={x:Static ObjectConverters.IsNotNull}}">
-        <CheckBox IsChecked="{Binding DeleteUpstream, Mode=TwoWay}">
-          <v:NameHighlightedTextBlock Foreground="{DynamicResource Brush.FG1}"
-                                      Text="{Binding DeleteUpstreamTip, Mode=OneWay}"
-                                      VerticalAlignment="Center"/>
-        </CheckBox>
-      </Border>
+      <CheckBox Grid.Row="3" Grid.Column="1"
+                Height="32"
+                Content="{DynamicResource Text.DeleteBranch.Force}"
+                IsChecked="{Binding Force, Mode=TwoWay}"
+                ToolTip.Tip="--force"
+                IsVisible="{Binding Target.IsLocal, Mode=OneWay}"/>
 
-      <StackPanel Grid.Row="3" Grid.Column="1"
+      <StackPanel Grid.Row="4" Grid.Column="1"
                   Height="32"
                   Orientation="Horizontal"
                   IsVisible="{Binding !Target.IsLocal, Mode=OneWay}">