feature: allows to reword HEAD commit while keeping local changes

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

Author: love-linger

src/Commands/InteractiveRebase.cs

@@ -0,0 +1,16 @@
+namespace SourceGit.Commands
+{
+    public class InteractiveRebase : Command
+    {
+        public InteractiveRebase(string repo, string basedOn, bool autoStash)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Editor = EditorType.RebaseEditor;
+            Args = "rebase -i --autosquash ";
+            if (autoStash)
+                Args += "--autostash ";
+            Args += basedOn;
+        }
+    }
+}

src/Commands/Rebase.cs

@@ -12,18 +12,4 @@ public Rebase(string repo, string basedOn, bool autoStash)
             Args += basedOn;
         }
     }
-
-    public class InteractiveRebase : Command
-    {
-        public InteractiveRebase(string repo, string basedOn, bool autoStash)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Editor = EditorType.RebaseEditor;
-            Args = "rebase -i --autosquash ";
-            if (autoStash)
-                Args += "--autostash ";
-            Args += basedOn;
-        }
-    }
 }

src/ViewModels/Histories.cs

@@ -518,12 +518,6 @@ public ContextMenu CreateContextMenuForSelectedCommits(List<Models.Commit> selec
                     reword.Icon = App.CreateMenuIcon("Icons.Edit");
                     reword.Click += (_, e) =>
                     {
-                        if (_repo.LocalChangesCount > 0)
-                        {
-                            App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
-                            return;
-                        }
-
                         if (_repo.CanCreatePopup())
                             _repo.ShowPopup(new Reword(_repo, commit));
                         e.Handled = true;

src/ViewModels/Reword.cs

@@ -32,16 +32,47 @@ public override async Task<bool> Sure()
                 return true;
 
             _repo.SetWatcherEnabled(false);
-            ProgressDescription = "Editing head commit message ...";
+            ProgressDescription = "Editing HEAD message ...";
 
             var log = _repo.CreateLog("Reword HEAD");
             Use(log);
 
+            var changes = await new Commands.QueryLocalChanges(_repo.FullPath, false).GetResultAsync();
             var signOff = _repo.Settings.EnableSignOffForCommit;
-            var succ = await new Commands.Commit(_repo.FullPath, _message, signOff, true, false)
+            var needAutoStash = false;
+            var succ = false;
+
+            foreach (var c in changes)
+            {
+                if (c.Index != Models.ChangeState.None)
+                {
+                    needAutoStash = true;
+                    break;
+                }
+            }
+
+            if (needAutoStash)
+            {
+                succ = await new Commands.Stash(_repo.FullPath)
+                    .Use(log)
+                    .PushAsync("REWORD_AUTO_STASH");
+                if (!succ)
+                {
+                    log.Complete();
+                    _repo.SetWatcherEnabled(true);
+                    return false;
+                }
+            }
+
+            succ = await new Commands.Commit(_repo.FullPath, _message, signOff, true, false)
                 .Use(log)
                 .RunAsync();
 
+            if (succ && needAutoStash)
+                await new Commands.Stash(_repo.FullPath)
+                    .Use(log)
+                    .PopAsync("stash@{0}");
+
             log.Complete();
             _repo.SetWatcherEnabled(true);
             return succ;

src/ViewModels/Squash.cs

@@ -32,24 +32,31 @@ public override async Task<bool> Sure()
             var log = _repo.CreateLog("Squash");
             Use(log);
 
+            var changes = await new Commands.QueryLocalChanges(_repo.FullPath, false).GetResultAsync();
             var signOff = _repo.Settings.EnableSignOffForCommit;
-            var autoStashed = false;
-            bool succ;
+            var needAutoStash = false;
+            var succ = false;
 
-            if (_repo.LocalChangesCount > 0)
+            foreach (var c in changes)
+            {
+                if (c.Index != Models.ChangeState.None)
+                {
+                    needAutoStash = true;
+                    break;
+                }
+            }
+
+            if (needAutoStash)
             {
                 succ = await new Commands.Stash(_repo.FullPath)
                     .Use(log)
                     .PushAsync("SQUASH_AUTO_STASH");
-
                 if (!succ)
                 {
                     log.Complete();
                     _repo.SetWatcherEnabled(true);
                     return false;
                 }
-
-                autoStashed = true;
             }
 
             succ = await new Commands.Reset(_repo.FullPath, Target.SHA, "--soft")
@@ -61,7 +68,7 @@ public override async Task<bool> Sure()
                     .Use(log)
                     .RunAsync();
 
-            if (succ && autoStashed)
+            if (succ && needAutoStash)
                 await new Commands.Stash(_repo.FullPath)
                     .Use(log)
                     .PopAsync("stash@{0}");