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

This commit is contained in:
leo 2025-01-14 17:10:06 +08:00
parent d8168c3ba6
commit cc5f3ebfa5
No known key found for this signature in database
6 changed files with 56 additions and 108 deletions

View file

@ -76,14 +76,11 @@ namespace SourceGit.ViewModels
}
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 @@ namespace SourceGit.ViewModels
});
}
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)

View file

@ -57,8 +57,25 @@ namespace SourceGit.ViewModels
{
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 @@ namespace SourceGit.ViewModels
{
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 @@ namespace SourceGit.ViewModels
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;