refactor: rework Merge popup (#1973)

- Hide `Customize merge message` option when selected `Squash` or `Don't commit` mode.
- Read `$GIT_DIR/SQUASH_MSG` after merging with `Squash` mode
- Clear commit message after discarding all changes
- Cleanup code

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

Author: love-linger

src/ViewModels/AIAssistant.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -23,12 +22,11 @@ public string Text
             private set => SetProperty(ref _text, value);
         }
 
-        public AIAssistant(Repository repo, Models.OpenAIService service, List<Models.Change> changes, Action<string> onApply)
+        public AIAssistant(Repository repo, Models.OpenAIService service, List<Models.Change> changes)
         {
             _repo = repo;
             _service = service;
             _changes = changes;
-            _onApply = onApply;
             _cancel = new CancellationTokenSource();
 
             Gen();
@@ -44,7 +42,7 @@ public void Regen()
 
         public void Apply()
         {
-            _onApply?.Invoke(Text);
+            _repo.SetCommitMessage(Text);
         }
 
         public void Cancel()
@@ -72,7 +70,6 @@ private void Gen()
         private readonly Repository _repo = null;
         private Models.OpenAIService _service = null;
         private List<Models.Change> _changes = null;
-        private Action<string> _onApply = null;
         private CancellationTokenSource _cancel = null;
         private bool _isGenerating = false;
         private string _text = string.Empty;

src/ViewModels/Discard.cs

@@ -71,9 +71,14 @@ public override async Task<bool> Sure()
             Use(log);
 
             if (Mode is DiscardAllMode all)
+            {
                 await Commands.Discard.AllAsync(_repo.FullPath, all.IncludeUntracked, all.IncludeIgnored, log);
+                _repo.ClearCommitMessage();
+            }
             else
+            {
                 await Commands.Discard.ChangesAsync(_repo.FullPath, _changes, log);
+            }
 
             log.Complete();
             _repo.MarkWorkingCopyDirtyManually();

src/ViewModels/Merge.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
@@ -16,8 +17,20 @@ public string Into
 
         public Models.MergeMode Mode
         {
-            get;
-            set;
+            get => _mode;
+            set
+            {
+                if (SetProperty(ref _mode, value))
+                    CanEditMessage = _mode == Models.MergeMode.Default ||
+                        _mode == Models.MergeMode.FastForward ||
+                        _mode == Models.MergeMode.NoFastForward;
+            }
+        }
+
+        public bool CanEditMessage
+        {
+            get => _canEditMessage;
+            set => SetProperty(ref _canEditMessage, value);
         }
 
         public bool Edit
@@ -65,12 +78,19 @@ public override async Task<bool> Sure()
             var log = _repo.CreateLog($"Merging '{_sourceName}' into '{Into}'");
             Use(log);
 
-            var succ = await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, Edit)
+            var succ = await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, _canEditMessage && Edit)
                 .Use(log)
                 .ExecAsync();
 
             if (succ)
             {
+                var squashMsgFile = Path.Combine(_repo.GitDir, "SQUASH_MSG");
+                if (Mode == Models.MergeMode.Squash && File.Exists(squashMsgFile))
+                {
+                    var msg = await File.ReadAllTextAsync(squashMsgFile);
+                    _repo.SetCommitMessage(msg);
+                }
+
                 var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
@@ -113,5 +133,7 @@ private Models.MergeMode AutoSelectMergeMode()
 
         private readonly Repository _repo = null;
         private readonly string _sourceName;
+        private Models.MergeMode _mode = Models.MergeMode.Default;
+        private bool _canEditMessage = true;
     }
 }

src/ViewModels/Repository.cs

@@ -888,6 +888,12 @@ public void NavigateToCommit(string sha, bool isDelayMode = false)
             }
         }
 
+        public void SetCommitMessage(string message)
+        {
+            if (_workingCopy is not null)
+                _workingCopy.CommitMessage = message;
+        }
+
         public void ClearCommitMessage()
         {
             if (_workingCopy is not null)

src/Views/CommitMessageToolBox.axaml.cs

@@ -505,7 +505,7 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
 
                 if (services.Count == 1)
                 {
-                    await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], vm.Staged, t => vm.CommitMessage = t));
+                    await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], vm.Staged));
                     return;
                 }
 
@@ -517,7 +517,7 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
                     item.Header = service.Name;
                     item.Click += async (_, ev) =>
                     {
-                        await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, vm.Staged, t => vm.CommitMessage = t));
+                        await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, vm.Staged));
                         ev.Handled = true;
                     };
 

src/Views/Merge.axaml

@@ -19,7 +19,7 @@
                  Text="{DynamicResource Text.Merge}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="130,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -99,6 +99,7 @@
                 Height="32"
                 Content="{DynamicResource Text.Merge.Edit}"
                 IsChecked="{Binding Edit, Mode=TwoWay}"
+                IsVisible="{Binding CanEditMessage, Mode=OneWay}"
                 ToolTip.Tip="--edit"/>
     </Grid>
   </StackPanel>

src/Views/WorkingCopy.axaml.cs

@@ -890,7 +890,7 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.WorkingCopy vm,
                 {
                     ai.Click += async (_, e) =>
                     {
-                        await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], selectedStaged, t => vm.CommitMessage = t));
+                        await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], selectedStaged));
                         e.Handled = true;
                     };
                 }
@@ -904,7 +904,7 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.WorkingCopy vm,
                         item.Header = service.Name;
                         item.Click += async (_, e) =>
                         {
-                            await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, selectedStaged, t => vm.CommitMessage = t));
+                            await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, selectedStaged));
                             e.Handled = true;
                         };