refactor: do not run git add for untracked file while stashing local changes (#903)

Author: love-linger

src/Commands/QueryStashChanges.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace SourceGit.Commands
 {
@@ -8,7 +9,7 @@ public QueryStashes(string repo)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "stash list --pretty=format:%H%n%ct%n%gd%n%s";
+            Args = "stash list --pretty=format:%H%n%P%n%ct%n%gd%n%s";
         }
 
         public List<Models.Stash> Result()
@@ -26,21 +27,32 @@ protected override void OnReadline(string line)
                     _stashes.Add(_current);
                     break;
                 case 1:
-                    _current.Time = ulong.Parse(line);
+                    ParseParent(line);
                     break;
                 case 2:
-                    _current.Name = line;
+                    _current.Time = ulong.Parse(line);
                     break;
                 case 3:
+                    _current.Name = line;
+                    break;
+                case 4:
                     _current.Message = line;
                     break;
             }
 
             _nextLineIdx++;
-            if (_nextLineIdx > 3)
+            if (_nextLineIdx > 4)
                 _nextLineIdx = 0;
         }
 
+        private void ParseParent(string data)
+        {
+            if (data.Length < 8)
+                return;
+
+            _current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
+        }
+
         private readonly List<Models.Stash> _stashes = new List<Models.Stash>();
         private Models.Stash _current = null;
         private int _nextLineIdx = 0;

src/Commands/QueryStashes.cs

@@ -11,9 +11,19 @@ public Stash(string repo)
             Context = repo;
         }
 
-        public bool Push(string message)
+        public bool Push(string message, bool includeUntracked = true, bool keepIndex = false)
         {
-            Args = $"stash push -m \"{message}\"";
+            var builder = new StringBuilder();
+            builder.Append("stash push ");
+            if (includeUntracked)
+                builder.Append("--include-untracked ");
+            if (keepIndex)
+                builder.Append("--keep-index ");
+            builder.Append("-m \"");
+            builder.Append(message);
+            builder.Append("\"");
+
+            Args = builder.ToString();
             return Exec();
         }
 

src/Commands/Stash.cs

@@ -1,13 +1,16 @@
 using System;
+using System.Collections.Generic;
 
 namespace SourceGit.Models
 {
     public class Stash
     {
         public string Name { get; set; } = "";
         public string SHA { get; set; } = "";
+        public List<string> Parents { get; set; } = [];
         public ulong Time { get; set; } = 0;
         public string Message { get; set; } = "";
+        public bool HasUntracked => Parents.Count == 3;
 
         public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
     }

src/Models/Stash.cs

@@ -76,14 +76,11 @@ public override Task<bool> Sure()
                     }
                     else
                     {
-                        if (IncludeUntracked)
-                            AddUntracked(_changes);
-                        succ = StashWithChanges(_changes);
+                        succ = new Commands.Stash(_repo.FullPath).Push(Message, IncludeUntracked, KeepIndex);
                     }
                 }
                 else
                 {
-                    AddUntracked(_changes);
                     succ = StashWithChanges(_changes);
                 }
 
@@ -97,40 +94,6 @@ public override Task<bool> Sure()
             });
         }
 
-        private void AddUntracked(List<Models.Change> changes)
-        {
-            var toBeAdded = new List<Models.Change>();
-            foreach (var c in changes)
-            {
-                if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked)
-                    toBeAdded.Add(c);
-            }
-
-            if (toBeAdded.Count == 0)
-                return;
-
-            if (Native.OS.GitVersion >= Models.GitVersions.ADD_WITH_PATHSPECFILE)
-            {
-                var paths = new List<string>();
-                foreach (var c in toBeAdded)
-                    paths.Add(c.Path);
-
-                var tmpFile = Path.GetTempFileName();
-                File.WriteAllLines(tmpFile, paths);
-                new Commands.Add(_repo.FullPath, tmpFile).Exec();
-                File.Delete(tmpFile);
-            }
-            else
-            {
-                for (int i = 0; i < toBeAdded.Count; i += 10)
-                {
-                    var count = Math.Min(10, toBeAdded.Count - i);
-                    var step = toBeAdded.GetRange(i, count);
-                    new Commands.Add(_repo.FullPath, step).Exec();
-                }
-            }
-        }
-
         private bool StashWithChanges(List<Models.Change> changes)
         {
             if (changes.Count == 0)

src/ViewModels/StashChanges.cs

@@ -57,8 +57,25 @@ public Models.Stash SelectedStash
                     {
                         Task.Run(() =>
                         {
-                            var changes = new Commands.QueryStashChanges(_repo.FullPath, value.SHA).Result();
-                            Dispatcher.UIThread.Invoke(() => Changes = changes);
+                            var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
+                            var untracked = new HashSet<string>();
+                            if (value.HasUntracked)
+                            {
+                                var untrackedChanges = new Commands.CompareRevisions(_repo.FullPath, "4b825dc642cb6eb9a060e54bf8d69288fbee4904", value.Parents[2]).Result();
+                                foreach (var c in untrackedChanges)
+                                {
+                                    untracked.Add(c.Path);
+                                    changes.Add(c);
+                                }
+                            }
+
+                            changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
+
+                            Dispatcher.UIThread.Invoke(() =>
+                            {
+                                Changes = changes;
+                                _untrackedChanges = untracked;
+                            });
                         });
                     }
                 }
@@ -84,8 +101,10 @@ public Models.Change SelectedChange
                 {
                     if (value == null)
                         DiffContext = null;
+                    else if (_untrackedChanges.Contains(value.Path))
+                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption("4b825dc642cb6eb9a060e54bf8d69288fbee4904", _selectedStash.Parents[2], value), _diffContext);
                     else
-                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, value), _diffContext);
+                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, value), _diffContext);
                 }
             }
         }
@@ -254,6 +273,7 @@ private void RefreshVisible()
         private List<Models.Stash> _visibleStashes = new List<Models.Stash>();
         private string _searchFilter = string.Empty;
         private Models.Stash _selectedStash = null;
+        private HashSet<string> _untrackedChanges = new HashSet<string>();
         private List<Models.Change> _changes = null;
         private Models.Change _selectedChange = null;
         private DiffContext _diffContext = null;