enhance: stage/unstage operation

- Do not use `add .` since it may run very slowly
- Rename `UnstageChangesForAmend` command to `UpdateIndexInfo` and force using UTF-8 (without BOM) encoding for inputs
- Remove unused commands

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

Author: love-linger

src/Commands/Add.cs

@@ -2,25 +2,11 @@
 {
     public class Add : Command
     {
-        public Add(string repo, bool includeUntracked)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = includeUntracked ? "add ." : "add -u .";
-        }
-
-        public Add(string repo, Models.Change change)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = $"add -- {change.Path.Quoted()}";
-        }
-
         public Add(string repo, string pathspecFromFile)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"add --pathspec-from-file={pathspecFromFile.Quoted()}";
+            Args = $"add --force --verbose --pathspec-from-file={pathspecFromFile.Quoted()}";
         }
     }
 }

src/Commands/Restore.cs

@@ -4,38 +4,13 @@ namespace SourceGit.Commands
 {
     public class Restore : Command
     {
-        /// <summary>
-        ///     Only used for single staged change.
-        /// </summary>
-        /// <param name="repo"></param>
-        /// <param name="stagedChange"></param>
-        public Restore(string repo, Models.Change stagedChange)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("restore --staged -- ").Append(stagedChange.Path.Quoted());
-
-            if (stagedChange.Index == Models.ChangeState.Renamed)
-                builder.Append(' ').Append(stagedChange.OriginalPath.Quoted());
-
-            Args = builder.ToString();
-        }
-
-        /// <summary>
-        ///     Restore changes given in a path-spec file.
-        /// </summary>
-        /// <param name="repo"></param>
-        /// <param name="pathspecFile"></param>
-        /// <param name="isStaged"></param>
         public Restore(string repo, string pathspecFile, bool isStaged)
         {
             WorkingDirectory = repo;
             Context = repo;
 
             var builder = new StringBuilder();
-            builder.Append("restore ");
+            builder.Append("restore --progress ");
             builder.Append(isStaged ? "--staged " : "--worktree --recurse-submodules ");
             builder.Append("--pathspec-from-file=").Append(pathspecFile.Quoted());
 

src/Commands/UnstageChangesForAmend.cs src/Commands/UpdateIndexInfo.cssrc/Commands/UnstageChangesForAmend.cs renamed to src/Commands/UpdateIndexInfo.cs

@@ -6,9 +6,9 @@
 
 namespace SourceGit.Commands
 {
-    public class UnstageChangesForAmend
+    public class UpdateIndexInfo
     {
-        public UnstageChangesForAmend(string repo, List<Models.Change> changes)
+        public UpdateIndexInfo(string repo, List<Models.Change> changes)
         {
             _repo = repo;
 
@@ -18,7 +18,7 @@ public UnstageChangesForAmend(string repo, List<Models.Change> changes)
                 {
                     _patchBuilder.Append("0 0000000000000000000000000000000000000000\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\0100644 ");
+                    _patchBuilder.Append("\n100644 ");
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.OriginalPath);
@@ -60,6 +60,8 @@ public async Task<bool> ExecAsync()
             starter.RedirectStandardInput = true;
             starter.RedirectStandardOutput = false;
             starter.RedirectStandardError = true;
+            starter.StandardInputEncoding = new UTF8Encoding(false);
+            starter.StandardErrorEncoding = Encoding.UTF8;
 
             try
             {
@@ -78,7 +80,7 @@ public async Task<bool> ExecAsync()
             }
             catch (Exception e)
             {
-                App.RaiseException(_repo, "Failed to unstage changes: " + e.Message);
+                App.RaiseException(_repo, "Failed to update index: " + e.Message);
                 return false;
             }
         }

src/ViewModels/Discard.cs

@@ -67,7 +67,7 @@ public override async Task<bool> Sure()
             using var lockWatcher = _repo.LockWatcher();
             ProgressDescription = _changes == null ? "Discard all local changes ..." : $"Discard total {_changes.Count} changes ...";
 
-            var log = _repo.CreateLog("Discard all");
+            var log = _repo.CreateLog("Discard Changes");
             Use(log);
 
             if (Mode is DiscardAllMode all)

src/ViewModels/WorkingCopy.cs

@@ -348,22 +348,15 @@ public async Task StageChangesAsync(List<Models.Change> changes, Models.Change n
             using var lockWatcher = _repo.LockWatcher();
 
             var log = _repo.CreateLog("Stage");
-            if (count == _unstaged.Count)
+            var pathSpecFile = Path.GetTempFileName();
+            await using (var writer = new StreamWriter(pathSpecFile))
             {
-                await new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Use(log).ExecAsync();
+                foreach (var c in canStaged)
+                    await writer.WriteLineAsync(c.Path);
             }
-            else
-            {
-                var pathSpecFile = Path.GetTempFileName();
-                await using (var writer = new StreamWriter(pathSpecFile))
-                {
-                    foreach (var c in canStaged)
-                        await writer.WriteLineAsync(c.Path);
-                }
 
-                await new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).ExecAsync();
-                File.Delete(pathSpecFile);
-            }
+            await new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).ExecAsync();
+            File.Delete(pathSpecFile);
             log.Complete();
 
             _repo.MarkWorkingCopyDirtyManually();
@@ -385,7 +378,7 @@ public async Task UnstageChangesAsync(List<Models.Change> changes, Models.Change
             if (_useAmend)
             {
                 log.AppendLine("$ git update-index --index-info ");
-                await new Commands.UnstageChangesForAmend(_repo.FullPath, changes).ExecAsync();
+                await new Commands.UpdateIndexInfo(_repo.FullPath, changes).ExecAsync();
             }
             else
             {
@@ -646,16 +639,11 @@ public async Task CommitAsync(bool autoStage, bool autoPush)
             IsCommitting = true;
             _repo.Settings.PushCommitMessage(_commitMessage);
 
-            var log = _repo.CreateLog("Commit");
-            var succ = true;
             if (autoStage && _unstaged.Count > 0)
-                succ = await new Commands.Add(_repo.FullPath, _repo.IncludeUntracked)
-                    .Use(log)
-                    .ExecAsync()
-                    .ConfigureAwait(false);
+                await StageChangesAsync(_unstaged, null);
 
-            if (succ)
-                succ = await new Commands.Commit(_repo.FullPath, _commitMessage, EnableSignOff, NoVerifyOnCommit, _useAmend, _resetAuthor)
+            var log = _repo.CreateLog("Commit");
+            var succ = await new Commands.Commit(_repo.FullPath, _commitMessage, EnableSignOff, NoVerifyOnCommit, _useAmend, _resetAuthor)
                     .Use(log)
                     .RunAsync()
                     .ConfigureAwait(false);