feature: add a STAGE SELECTED & COMMIT button to Confirm Empty Commit dialog

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

Author: love-linger

src/App.axaml.cs

@@ -208,13 +208,14 @@ public static async Task<bool> AskConfirmAsync(string message, Models.ConfirmBut
             return false;
         }
 
-        public static async Task<Models.ConfirmEmptyCommitResult> AskConfirmEmptyCommitAsync(bool hasLocalChanges)
+        public static async Task<Models.ConfirmEmptyCommitResult> AskConfirmEmptyCommitAsync(bool hasLocalChanges, bool hasSelectedUnstaged)
         {
             if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
             {
                 var confirm = new Views.ConfirmEmptyCommit();
                 confirm.TxtMessage.Text = Text(hasLocalChanges ? "ConfirmEmptyCommit.WithLocalChanges" : "ConfirmEmptyCommit.NoLocalChanges");
                 confirm.BtnStageAllAndCommit.IsVisible = hasLocalChanges;
+                confirm.BtnStageSelectedAndCommit.IsVisible = hasSelectedUnstaged;
                 return await confirm.ShowDialog<Models.ConfirmEmptyCommitResult>(owner);
             }
 

src/Models/ConfirmEmptyCommitResult.cs

@@ -3,6 +3,7 @@
     public enum ConfirmEmptyCommitResult
     {
         Cancel = 0,
+        StageSelectedAndCommit,
         StageAllAndCommit,
         CreateEmptyCommit,
     }

src/Resources/Locales/en_US.axaml

@@ -281,7 +281,8 @@
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">CONTINUE</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">STAGE ALL &amp; COMMIT</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageSelectedThenCommit" xml:space="preserve">STAGE SELECTED &amp; COMMIT</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty) or auto-stage then commit?</x:String>
   <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">Restart Required</x:String>
   <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">You need to restart this app to apply changes.</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -284,8 +284,9 @@
   <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">启动时恢复打开的仓库</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">确认继续</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自动暂存并提交</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)或是自动暂存所有变更并提交？</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">暂存所有变更并提交</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageSelectedThenCommit" xml:space="preserve">仅暂存所选变更并提交</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)或是自动暂存变更并提交？</x:String>
   <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">系统提示</x:String>
   <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">程序需要重新启动，以便修改生效！</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">规范化提交信息生成</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -284,8 +284,9 @@
   <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">啟動時還原上次開啟的存放庫</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">確認繼續</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">自動暫存並提交</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty) 或者自動暫存全部變更並提交?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">暫存全部變更並提交</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageSelectedThenCommit" xml:space="preserve">僅暫存所選變更并提交</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty) 或者自動暫存變更並提交?</x:String>
   <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">系統提示</x:String>
   <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">您需要重新啟動此應用程式才能套用變更!</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>

src/ViewModels/WorkingCopy.cs

@@ -643,12 +643,14 @@ public async Task CommitAsync(bool autoStage, bool autoPush)
             {
                 if ((!autoStage && _staged.Count == 0) || (autoStage && _cached.Count == 0))
                 {
-                    var rs = await App.AskConfirmEmptyCommitAsync(_cached.Count > 0);
+                    var rs = await App.AskConfirmEmptyCommitAsync(_cached.Count > 0, _selectedUnstaged is { Count: > 0 });
                     if (rs == Models.ConfirmEmptyCommitResult.Cancel)
                         return;
 
                     if (rs == Models.ConfirmEmptyCommitResult.StageAllAndCommit)
                         autoStage = true;
+                    else if (rs == Models.ConfirmEmptyCommitResult.StageSelectedAndCommit)
+                        await StageChangesAsync(_selectedUnstaged, null);
                 }
             }
 

src/Views/ConfirmEmptyCommit.axaml

@@ -37,11 +37,20 @@
 
     <!-- Body -->
     <Border Grid.Row="1" Margin="16">
-      <TextBlock x:Name="TxtMessage" MaxWidth="520" TextWrapping="Wrap"/>
+      <TextBlock x:Name="TxtMessage" TextWrapping="NoWrap"/>
     </Border>
 
     <!-- Buttons -->
-    <StackPanel Grid.Row="2" Margin="0,0,0,16" Orientation="Horizontal" HorizontalAlignment="Center">
+    <StackPanel Grid.Row="2" Margin="32,0,32,16" Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Classes="flat"
+              x:Name="BtnStageSelectedAndCommit"
+              Height="30"
+              Margin="4,0"
+              Click="StageSelectedThenCommit"
+              Content="{DynamicResource Text.ConfirmEmptyCommit.StageSelectedThenCommit}"
+              HorizontalContentAlignment="Center"
+              VerticalContentAlignment="Center"/>
+      
       <Button Classes="flat"
               x:Name="BtnStageAllAndCommit"
               Height="30"

src/Views/ConfirmEmptyCommit.axaml.cs

@@ -9,6 +9,11 @@ public ConfirmEmptyCommit()
             InitializeComponent();
         }
 
+        private void StageSelectedThenCommit(object _1, RoutedEventArgs _2)
+        {
+            Close(Models.ConfirmEmptyCommitResult.StageSelectedAndCommit);
+        }
+
         private void StageAllThenCommit(object _1, RoutedEventArgs _2)
         {
             Close(Models.ConfirmEmptyCommitResult.StageAllAndCommit);