github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 05:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use a single command to get staged files with --amend option enabled

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-03-25 14:59:47 +08:00
parent 917c3177fc
commit 446c806246
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Commands/QueryStagedChangesWithAmend.cs
View File

@@ -11,20 +11,29 @@ namespace SourceGit.Commands
[GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{4,64}) [0-9a-f]{4,64} ([RC])\d{0,6}\t(.*\t.*)$")]
private static partial Regex REG_FORMAT2();
public QueryStagedChangesWithAmend(string repo, string parent)
public QueryStagedChangesWithAmend(string repo)
{
WorkingDirectory = repo;
Context = repo;
Args = $"diff-index --cached -M {parent}";
_parent = parent;
}
public List<Models.Change> GetResult()
{
Args = "show --no-show-signature --format=\"%H %P\" -s HEAD";
var rs = ReadToEnd();
if (!rs.IsSuccess)
return [];
var shas = rs.StdOut.Trim().Split(' ', StringSplitOptions.RemoveEmptyEntries);
if (shas.Length == 0)
return [];
var parent = shas.Length > 1 ? shas[1] : Models.EmptyTreeHash.Guess(shas[0]);
Args = $"diff-index --cached -M {parent}";
rs = ReadToEnd();
if (!rs.IsSuccess)
return [];
var changes = new List<Models.Change>();
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
@@ -39,7 +48,7 @@ namespace SourceGit.Commands
{
FileMode = match.Groups[1].Value,
ObjectHash = match.Groups[2].Value,
ParentSHA = _parent,
ParentSHA = parent,
},
};
var type = match.Groups[3].Value;
@@ -58,7 +67,7 @@ namespace SourceGit.Commands
{
FileMode = match.Groups[1].Value,
ObjectHash = match.Groups[2].Value,
ParentSHA = _parent,
ParentSHA = parent,
},
};
@@ -84,7 +93,5 @@ namespace SourceGit.Commands
return changes;
}
private readonly string _parent;
}
}

5
src/ViewModels/WorkingCopy.cs
View File

@@ -741,10 +741,7 @@ namespace SourceGit.ViewModels
private List<Models.Change> GetStagedChanges(List<Models.Change> cached)
{
if (_useAmend)
{
var head = new Commands.QuerySingleCommit(_repo.FullPath, "HEAD").GetResult();
return new Commands.QueryStagedChangesWithAmend(_repo.FullPath, head.FirstParentToCompare).GetResult();
}
return new Commands.QueryStagedChangesWithAmend(_repo.FullPath).GetResult();
var rs = new List<Models.Change>();
foreach (var c in cached)