From 875d09692c4e37f05b98933d478799e975317cec Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 1 Nov 2026 19:18:14 +0000 Subject: [PATCH 1/4] enhance: query local changes with `git status --porcelain=v2 -z` The porcelain v1 output parsed before is line based and C-quotes paths containing special characters (`"`, `\`, tab, newline...), and renames are reported as `old -> new` text. Such paths were shown and used with their escape sequences (e.g. `quo\"te.txt`), and a path containing ` -> ` could be split wrongly. Use the NUL-separated porcelain v2 format instead: paths are never quoted and the original path of a rename/copy is a separate field. Every status combination maps to the same `ChangeState`/`ConflictReason` as before. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01KCxH1zwDXLd9kfAAkcf6PZ --- src/Commands/QueryLocalChanges.cs | 274 ++++++++++++++++-------------- 1 file changed, 143 insertions(+), 131 deletions(-) diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs index 7c2e4156ab..ebe9869e9e 100644 --- a/src/Commands/QueryLocalChanges.cs +++ b/src/Commands/QueryLocalChanges.cs @@ -1,16 +1,13 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Diagnostics; using System.Text; -using System.Text.RegularExpressions; using System.Threading.Tasks; namespace SourceGit.Commands { - public partial class QueryLocalChanges : Command + public class QueryLocalChanges : Command { - [GeneratedRegex(@"^(\s?[\w\?]{1,4})\s+(.+)$")] - private static partial Regex REG_FORMAT(); - public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptionalLocks = true) { WorkingDirectory = repo; @@ -20,9 +17,9 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio if (noOptionalLocks) builder.Append("--no-optional-locks "); if (includeUntracked) - builder.Append("-c core.untrackedCache=true -c status.showUntrackedFiles=all status -uall --ignore-submodules=dirty --porcelain"); + builder.Append("-c core.untrackedCache=true -c status.showUntrackedFiles=all status -uall --ignore-submodules=dirty --porcelain=v2 -z"); else - builder.Append("status -uno --ignore-submodules=dirty --porcelain"); + builder.Append("status -uno --ignore-submodules=dirty --porcelain=v2 -z"); Args = builder.ToString(); } @@ -52,133 +49,49 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio }); } - while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line) - { - var match = REG_FORMAT().Match(line); - if (!match.Success) - continue; - - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; + var buffer = new char[8192]; + var record = new StringBuilder(); + var waitingOriginalPath = false; + Models.Change renamed = null; + int count; - switch (status) + while ((count = await proc.StandardOutput.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0) + { + var start = 0; + while (start < count) { - case " M": - change.Set(Models.ChangeState.None, Models.ChangeState.Modified); - break; - case " T": - change.Set(Models.ChangeState.None, Models.ChangeState.TypeChanged); - break; - case " A": - change.Set(Models.ChangeState.None, Models.ChangeState.Added); - break; - case " D": - change.Set(Models.ChangeState.None, Models.ChangeState.Deleted); - break; - case " R": - change.Set(Models.ChangeState.None, Models.ChangeState.Renamed); - break; - case " C": - change.Set(Models.ChangeState.None, Models.ChangeState.Copied); - break; - case "M": - change.Set(Models.ChangeState.Modified); - break; - case "MM": - change.Set(Models.ChangeState.Modified, Models.ChangeState.Modified); - break; - case "MT": - change.Set(Models.ChangeState.Modified, Models.ChangeState.TypeChanged); - break; - case "MD": - change.Set(Models.ChangeState.Modified, Models.ChangeState.Deleted); - break; - case "T": - change.Set(Models.ChangeState.TypeChanged); - break; - case "TM": - change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.Modified); - break; - case "TT": - change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.TypeChanged); - break; - case "TD": - change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.Deleted); - break; - case "A": - change.Set(Models.ChangeState.Added); - break; - case "AM": - change.Set(Models.ChangeState.Added, Models.ChangeState.Modified); - break; - case "AT": - change.Set(Models.ChangeState.Added, Models.ChangeState.TypeChanged); - break; - case "AD": - change.Set(Models.ChangeState.Added, Models.ChangeState.Deleted); - break; - case "D": - change.Set(Models.ChangeState.Deleted); - break; - case "R": - change.Set(Models.ChangeState.Renamed); - break; - case "RM": - change.Set(Models.ChangeState.Renamed, Models.ChangeState.Modified); - break; - case "RT": - change.Set(Models.ChangeState.Renamed, Models.ChangeState.TypeChanged); - break; - case "RD": - change.Set(Models.ChangeState.Renamed, Models.ChangeState.Deleted); - break; - case "C": - change.Set(Models.ChangeState.Copied); - break; - case "CM": - change.Set(Models.ChangeState.Copied, Models.ChangeState.Modified); - break; - case "CT": - change.Set(Models.ChangeState.Copied, Models.ChangeState.TypeChanged); - break; - case "CD": - change.Set(Models.ChangeState.Copied, Models.ChangeState.Deleted); - break; - case "DD": - change.ConflictReason = Models.ConflictReason.BothDeleted; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "AU": - change.ConflictReason = Models.ConflictReason.AddedByUs; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "UD": - change.ConflictReason = Models.ConflictReason.DeletedByThem; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "UA": - change.ConflictReason = Models.ConflictReason.AddedByThem; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "DU": - change.ConflictReason = Models.ConflictReason.DeletedByUs; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "AA": - change.ConflictReason = Models.ConflictReason.BothAdded; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "UU": - change.ConflictReason = Models.ConflictReason.BothModified; - change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted); - break; - case "??": - change.Set(Models.ChangeState.None, Models.ChangeState.Untracked); + var end = Array.IndexOf(buffer, '\0', start, count - start); + if (end < 0) + { + record.Append(buffer, start, count - start); break; - } + } - if (change.Index != Models.ChangeState.None || change.WorkTree != Models.ChangeState.None) - outs.Add(change); + record.Append(buffer, start, end - start); + start = end + 1; + + // For renamed/copied entries, the original path is output as an extra field. + if (waitingOriginalPath) + { + if (renamed != null) + renamed.OriginalPath = record.ToString(); + + waitingOriginalPath = false; + renamed = null; + } + else + { + var change = ParseRecord(record.ToString(), out waitingOriginalPath); + if (change != null) + { + outs.Add(change); + if (waitingOriginalPath) + renamed = change; + } + } + + record.Clear(); + } } lock (capturedLock) @@ -194,6 +107,105 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio return outs; } + private static Models.Change ParseRecord(string record, out bool hasOriginalPath) + { + hasOriginalPath = false; + if (record.Length < 3) + return null; + + var change = new Models.Change(); + switch (record[0]) + { + case '1': + // 1 + var ordinary = record.Split(' ', 9); + if (ordinary.Length != 9) + return null; + + change.Path = ordinary[8]; + (change.Index, change.WorkTree) = ParseState(ordinary[1]); + break; + case '2': + // 2 , followed by as the next field + hasOriginalPath = true; + + var renamed = record.Split(' ', 10); + if (renamed.Length != 10) + return null; + + change.Path = renamed[9]; + (change.Index, change.WorkTree) = ParseState(renamed[1]); + break; + case 'u': + // u

+ var unmerged = record.Split(' ', 11); + if (unmerged.Length != 11) + return null; + + change.Path = unmerged[10]; + change.ConflictReason = unmerged[1] switch + { + "DD" => Models.ConflictReason.BothDeleted, + "AU" => Models.ConflictReason.AddedByUs, + "UD" => Models.ConflictReason.DeletedByThem, + "UA" => Models.ConflictReason.AddedByThem, + "DU" => Models.ConflictReason.DeletedByUs, + "AA" => Models.ConflictReason.BothAdded, + "UU" => Models.ConflictReason.BothModified, + _ => Models.ConflictReason.None, + }; + + if (change.ConflictReason != Models.ConflictReason.None) + change.WorkTree = Models.ChangeState.Conflicted; + break; + case '?': + // ? + change.Path = record.Substring(2); + change.WorkTree = Models.ChangeState.Untracked; + break; + } + + if (change.Index == Models.ChangeState.None && change.WorkTree == Models.ChangeState.None) + return null; + + return change; + } + + private static (Models.ChangeState, Models.ChangeState) ParseState(string xy) + { + return xy switch + { + ".M" => (Models.ChangeState.None, Models.ChangeState.Modified), + ".T" => (Models.ChangeState.None, Models.ChangeState.TypeChanged), + ".A" => (Models.ChangeState.None, Models.ChangeState.Added), + ".D" => (Models.ChangeState.None, Models.ChangeState.Deleted), + ".R" => (Models.ChangeState.None, Models.ChangeState.Renamed), + ".C" => (Models.ChangeState.None, Models.ChangeState.Copied), + "M." => (Models.ChangeState.Modified, Models.ChangeState.None), + "MM" => (Models.ChangeState.Modified, Models.ChangeState.Modified), + "MT" => (Models.ChangeState.Modified, Models.ChangeState.TypeChanged), + "MD" => (Models.ChangeState.Modified, Models.ChangeState.Deleted), + "T." => (Models.ChangeState.TypeChanged, Models.ChangeState.None), + "TM" => (Models.ChangeState.TypeChanged, Models.ChangeState.Modified), + "TT" => (Models.ChangeState.TypeChanged, Models.ChangeState.TypeChanged), + "TD" => (Models.ChangeState.TypeChanged, Models.ChangeState.Deleted), + "A." => (Models.ChangeState.Added, Models.ChangeState.None), + "AM" => (Models.ChangeState.Added, Models.ChangeState.Modified), + "AT" => (Models.ChangeState.Added, Models.ChangeState.TypeChanged), + "AD" => (Models.ChangeState.Added, Models.ChangeState.Deleted), + "D." => (Models.ChangeState.Deleted, Models.ChangeState.None), + "R." => (Models.ChangeState.Renamed, Models.ChangeState.None), + "RM" => (Models.ChangeState.Renamed, Models.ChangeState.Modified), + "RT" => (Models.ChangeState.Renamed, Models.ChangeState.TypeChanged), + "RD" => (Models.ChangeState.Renamed, Models.ChangeState.Deleted), + "C." => (Models.ChangeState.Copied, Models.ChangeState.None), + "CM" => (Models.ChangeState.Copied, Models.ChangeState.Modified), + "CT" => (Models.ChangeState.Copied, Models.ChangeState.TypeChanged), + "CD" => (Models.ChangeState.Copied, Models.ChangeState.Deleted), + _ => (Models.ChangeState.None, Models.ChangeState.None), + }; + } + private class CapturedProcess { public Process Process { get; set; } = null; From 660286cfe223fa141439132e214ae518dd6f00e9 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 20 Nov 2026 13:12:38 +0800 Subject: [PATCH 2/4] code_review: PR #2872 - Read all output at once - Only create change object when it is needed --- src/Commands/QueryLocalChanges.cs | 208 ++++++++++++++---------------- 1 file changed, 94 insertions(+), 114 deletions(-) diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs index ebe9869e9e..30a4ba3ae9 100644 --- a/src/Commands/QueryLocalChanges.cs +++ b/src/Commands/QueryLocalChanges.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Text; using System.Threading.Tasks; @@ -49,48 +50,36 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio }); } - var buffer = new char[8192]; - var record = new StringBuilder(); - var waitingOriginalPath = false; - Models.Change renamed = null; - int count; + using var ms = new MemoryStream(); + await proc.StandardOutput.BaseStream.CopyToAsync(ms, CancellationToken).ConfigureAwait(false); - while ((count = await proc.StandardOutput.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0) + if (!CancellationToken.IsCancellationRequested && ms.TryGetBuffer(out var buffer)) { - var start = 0; - while (start < count) + var start = buffer.Offset; + var end = buffer.Offset + buffer.Count; + var waitingOriginalPath = false; + while (start < end) { - var end = Array.IndexOf(buffer, '\0', start, count - start); - if (end < 0) - { - record.Append(buffer, start, count - start); - break; - } - - record.Append(buffer, start, end - start); - start = end + 1; - - // For renamed/copied entries, the original path is output as an extra field. + var lineEnd = Array.IndexOf(buffer.Array, (byte)'\0', start); + var line = Encoding.UTF8.GetString(lineEnd < start ? buffer[start..] : buffer[start..lineEnd]); if (waitingOriginalPath) { - if (renamed != null) - renamed.OriginalPath = record.ToString(); + if (outs.Count > 0) + outs[^1].OriginalPath = line; waitingOriginalPath = false; - renamed = null; } - else + else if (line.Length >= 3) { - var change = ParseRecord(record.ToString(), out waitingOriginalPath); + var change = ParseLine(line, out waitingOriginalPath); if (change != null) - { outs.Add(change); - if (waitingOriginalPath) - renamed = change; - } } - record.Clear(); + if (lineEnd < start) + break; + + start = lineEnd + 1; } } @@ -107,102 +96,93 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio return outs; } - private static Models.Change ParseRecord(string record, out bool hasOriginalPath) + private static Models.Change ParseLine(string line, out bool hasOriginalPath) { + var ch = line[0]; hasOriginalPath = false; - if (record.Length < 3) - return null; - var change = new Models.Change(); - switch (record[0]) + // ? - Untracked files + if (ch == '?') { - case '1': - // 1 - var ordinary = record.Split(' ', 9); - if (ordinary.Length != 9) - return null; - - change.Path = ordinary[8]; - (change.Index, change.WorkTree) = ParseState(ordinary[1]); - break; - case '2': - // 2 , followed by as the next field - hasOriginalPath = true; - - var renamed = record.Split(' ', 10); - if (renamed.Length != 10) - return null; - - change.Path = renamed[9]; - (change.Index, change.WorkTree) = ParseState(renamed[1]); - break; - case 'u': - // u

- var unmerged = record.Split(' ', 11); - if (unmerged.Length != 11) - return null; - - change.Path = unmerged[10]; - change.ConflictReason = unmerged[1] switch - { - "DD" => Models.ConflictReason.BothDeleted, - "AU" => Models.ConflictReason.AddedByUs, - "UD" => Models.ConflictReason.DeletedByThem, - "UA" => Models.ConflictReason.AddedByThem, - "DU" => Models.ConflictReason.DeletedByUs, - "AA" => Models.ConflictReason.BothAdded, - "UU" => Models.ConflictReason.BothModified, - _ => Models.ConflictReason.None, - }; - - if (change.ConflictReason != Models.ConflictReason.None) - change.WorkTree = Models.ChangeState.Conflicted; - break; - case '?': - // ? - change.Path = record.Substring(2); - change.WorkTree = Models.ChangeState.Untracked; - break; + var change = new Models.Change(); + change.WorkTree = Models.ChangeState.Untracked; + change.Path = line.Substring(2); + return change; } - if (change.Index == Models.ChangeState.None && change.WorkTree == Models.ChangeState.None) - return null; + // 1 + if (ch == '1') + { + var ordinary = line.Split(' ', 9); + if (ordinary.Length != 9) + return null; + + var index = ParseState(line[2]); + var worktree = ParseState(line[3]); + if (index == Models.ChangeState.None && worktree == Models.ChangeState.None) + return null; + + var change = new Models.Change(); + change.Path = ordinary[8]; + change.Index = index; + change.WorkTree = worktree; + return change; + } + + // 2 - Renamed Change. The next line is the original path. + if (ch == '2') + { + hasOriginalPath = true; + + var renamed = line.Split(' ', 10); + if (renamed.Length != 10) + return null; + + var change = new Models.Change(); + change.Path = renamed[9]; + change.Index = ParseState(line[2]); + change.WorkTree = ParseState(line[3]); + return change; + } + + // u

- Unmerged (Conflicted) + if (ch == 'u') + { + var unmerged = line.Split(' ', 11); + if (unmerged.Length != 11) + return null; + + var change = new Models.Change(); + change.Path = unmerged[10]; + change.WorkTree = Models.ChangeState.Conflicted; + change.ConflictReason = unmerged[1] switch + { + "DD" => Models.ConflictReason.BothDeleted, + "AU" => Models.ConflictReason.AddedByUs, + "UD" => Models.ConflictReason.DeletedByThem, + "UA" => Models.ConflictReason.AddedByThem, + "DU" => Models.ConflictReason.DeletedByUs, + "AA" => Models.ConflictReason.BothAdded, + _ => Models.ConflictReason.BothModified, + }; + + return change; + } - return change; + return null; } - private static (Models.ChangeState, Models.ChangeState) ParseState(string xy) + private static Models.ChangeState ParseState(char c) { - return xy switch + return c switch { - ".M" => (Models.ChangeState.None, Models.ChangeState.Modified), - ".T" => (Models.ChangeState.None, Models.ChangeState.TypeChanged), - ".A" => (Models.ChangeState.None, Models.ChangeState.Added), - ".D" => (Models.ChangeState.None, Models.ChangeState.Deleted), - ".R" => (Models.ChangeState.None, Models.ChangeState.Renamed), - ".C" => (Models.ChangeState.None, Models.ChangeState.Copied), - "M." => (Models.ChangeState.Modified, Models.ChangeState.None), - "MM" => (Models.ChangeState.Modified, Models.ChangeState.Modified), - "MT" => (Models.ChangeState.Modified, Models.ChangeState.TypeChanged), - "MD" => (Models.ChangeState.Modified, Models.ChangeState.Deleted), - "T." => (Models.ChangeState.TypeChanged, Models.ChangeState.None), - "TM" => (Models.ChangeState.TypeChanged, Models.ChangeState.Modified), - "TT" => (Models.ChangeState.TypeChanged, Models.ChangeState.TypeChanged), - "TD" => (Models.ChangeState.TypeChanged, Models.ChangeState.Deleted), - "A." => (Models.ChangeState.Added, Models.ChangeState.None), - "AM" => (Models.ChangeState.Added, Models.ChangeState.Modified), - "AT" => (Models.ChangeState.Added, Models.ChangeState.TypeChanged), - "AD" => (Models.ChangeState.Added, Models.ChangeState.Deleted), - "D." => (Models.ChangeState.Deleted, Models.ChangeState.None), - "R." => (Models.ChangeState.Renamed, Models.ChangeState.None), - "RM" => (Models.ChangeState.Renamed, Models.ChangeState.Modified), - "RT" => (Models.ChangeState.Renamed, Models.ChangeState.TypeChanged), - "RD" => (Models.ChangeState.Renamed, Models.ChangeState.Deleted), - "C." => (Models.ChangeState.Copied, Models.ChangeState.None), - "CM" => (Models.ChangeState.Copied, Models.ChangeState.Modified), - "CT" => (Models.ChangeState.Copied, Models.ChangeState.TypeChanged), - "CD" => (Models.ChangeState.Copied, Models.ChangeState.Deleted), - _ => (Models.ChangeState.None, Models.ChangeState.None), + 'M' => Models.ChangeState.Modified, + 'T' => Models.ChangeState.TypeChanged, + 'A' => Models.ChangeState.Added, + 'D' => Models.ChangeState.Deleted, + 'R' => Models.ChangeState.Renamed, + 'C' => Models.ChangeState.Copied, + _ => Models.ChangeState.None, }; } From e7dd4cda91b266a9cb13d80346a51fcdf27df0f6 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 20 Nov 2026 15:08:01 +0800 Subject: [PATCH 3/4] refactor: avoid parsing renamed path by spliting string with `\t` or `->` (#2872) (cherry picked from commit 2de3e6c532059a1861aa1503c8d28afa89bdbb2b) --- src/Commands/CompareRevisions.cs | 99 +++++++++++++-------- src/Commands/QueryFileHistory.cs | 36 +++----- src/Commands/QueryLocalChanges.cs | 31 ++----- src/Commands/QueryStagedChangesWithAmend.cs | 59 ++++++------ src/Models/Change.cs | 31 +++---- 5 files changed, 122 insertions(+), 134 deletions(-) diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs index c7ee58915a..04104bf9f1 100644 --- a/src/Commands/CompareRevisions.cs +++ b/src/Commands/CompareRevisions.cs @@ -1,5 +1,8 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Diagnostics; +using System.IO; +using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -7,9 +10,7 @@ namespace SourceGit.Commands { public partial class CompareRevisions : Command { - [GeneratedRegex(@"^([MADT])\s+(.+)$")] - private static partial Regex REG_FORMAT(); - [GeneratedRegex(@"^([CR])[0-9]{0,4}\s+(.+)$")] + [GeneratedRegex(@"^([CR])[0-9]{0,4}$")] private static partial Regex REG_RENAME_FORMAT(); public CompareRevisions(string repo, string start, string end) @@ -18,7 +19,7 @@ public CompareRevisions(string repo, string start, string end) Context = repo; var based = string.IsNullOrEmpty(start) ? "-R" : start; - Args = $"diff --name-status {based} {end}"; + Args = $"diff --name-status -z {based} {end}"; } public CompareRevisions(string repo, string start, string end, string path) @@ -27,7 +28,7 @@ public CompareRevisions(string repo, string start, string end, string path) Context = repo; var based = string.IsNullOrEmpty(start) ? "-R" : start; - Args = $"diff --name-status {based} {end} -- {path.Quoted()}"; + Args = $"diff --name-status -z {based} {end} -- {path.Quoted()}"; } public async Task> ReadAsync() @@ -39,49 +40,69 @@ public CompareRevisions(string repo, string start, string end, string path) proc.StartInfo = CreateGitStartInfo(true); proc.Start(); - while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line) + using var ms = new MemoryStream(); + await proc.StandardOutput.BaseStream.CopyToAsync(ms, CancellationToken).ConfigureAwait(false); + + if (ms.TryGetBuffer(out var buffer)) { - var match = REG_FORMAT().Match(line); - if (!match.Success) + var start = buffer.Offset; + var end = buffer.Offset + buffer.Count; + var waitingOriginalPath = false; + var waitingForPath = false; + + while (start < end) { - match = REG_RENAME_FORMAT().Match(line); - if (match.Success) + var lineEnd = Array.IndexOf(buffer.Array, (byte)'\0', start); + var line = Encoding.UTF8.GetString(lineEnd < 0 ? buffer[start..] : buffer[start..lineEnd]); + + if (waitingOriginalPath) { - var type = match.Groups[1].Value; - var renamed = new Models.Change() { Path = match.Groups[2].Value }; - renamed.Set(type == "R" ? Models.ChangeState.Renamed : Models.ChangeState.Copied); - changes.Add(renamed); - } + if (changes.Count > 0) + changes[^1].OriginalPath = line; - continue; - } + waitingOriginalPath = false; + } + else if (waitingForPath) + { + if (changes.Count > 0) + changes[^1].Path = line; - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; + waitingForPath = false; + } + else if (line.Equals("M", StringComparison.Ordinal)) + { + changes.Add(new Models.Change() { Index = Models.ChangeState.Modified }); + waitingForPath = true; + } + else if (line.Equals("A", StringComparison.Ordinal)) + { + changes.Add(new Models.Change() { Index = Models.ChangeState.Added }); + waitingForPath = true; + } + else if (line.Equals("D", StringComparison.Ordinal)) + { + changes.Add(new Models.Change() { Index = Models.ChangeState.Deleted }); + waitingForPath = true; + } + else if (line.Equals("T", StringComparison.Ordinal)) + { + changes.Add(new Models.Change() { Index = Models.ChangeState.TypeChanged }); + waitingForPath = true; + } + else if (REG_RENAME_FORMAT().IsMatch(line)) + { + changes.Add(new Models.Change() { Index = Models.Change.ParseState(line[0]) }); + waitingOriginalPath = true; + waitingForPath = true; + } - switch (status[0]) - { - case 'M': - change.Set(Models.ChangeState.Modified); - changes.Add(change); - break; - case 'A': - change.Set(Models.ChangeState.Added); - changes.Add(change); - break; - case 'D': - change.Set(Models.ChangeState.Deleted); - changes.Add(change); - break; - case 'T': - change.Set(Models.ChangeState.TypeChanged); - changes.Add(change); + if (lineEnd < 0) break; + + start = lineEnd + 1; } } - await proc.WaitForExitAsync().ConfigureAwait(false); - changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path)); } catch diff --git a/src/Commands/QueryFileHistory.cs b/src/Commands/QueryFileHistory.cs index 5dca109a2c..61f25c3959 100644 --- a/src/Commands/QueryFileHistory.cs +++ b/src/Commands/QueryFileHistory.cs @@ -10,7 +10,7 @@ public partial class QueryFileHistory : Command { [GeneratedRegex(@"^([MADT])\s+(.+)$")] private static partial Regex REG_FORMAT(); - [GeneratedRegex(@"^([CR])[0-9]{0,4}\s+(.+)$")] + [GeneratedRegex(@"^([CR])[0-9]{0,4}\s+(.+)\t(.+)$")] private static partial Regex REG_RENAME_FORMAT(); public QueryFileHistory(string repo, string path, string head) @@ -59,36 +59,20 @@ public QueryFileHistory(string repo, string path, string head) else if (last != null) { var match = REG_FORMAT().Match(line); - if (!match.Success) + if (match.Success) { - match = REG_RENAME_FORMAT().Match(line); - if (match.Success) - { - var type = match.Groups[1].Value; - last.Change.Path = match.Groups[2].Value; - last.Change.Set(type == "R" ? Models.ChangeState.Renamed : Models.ChangeState.Copied); - } - + last.Change.Path = match.Groups[2].Value; + last.Change.Index = Models.Change.ParseState(match.Groups[1].Value[0]); continue; } - last.Change.Path = match.Groups[2].Value; - - var status = match.Groups[1].Value; - switch (status[0]) + match = REG_RENAME_FORMAT().Match(line); + if (match.Success) { - case 'M': - last.Change.Set(Models.ChangeState.Modified); - break; - case 'A': - last.Change.Set(Models.ChangeState.Added); - break; - case 'D': - last.Change.Set(Models.ChangeState.Deleted); - break; - case 'T': - last.Change.Set(Models.ChangeState.TypeChanged); - break; + var type = match.Groups[1].Value; + last.Change.OriginalPath = match.Groups[2].Value; + last.Change.Path = match.Groups[3].Value; + last.Change.Index = Models.Change.ParseState(type[0]); } } } diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs index 30a4ba3ae9..8069c48077 100644 --- a/src/Commands/QueryLocalChanges.cs +++ b/src/Commands/QueryLocalChanges.cs @@ -60,8 +60,8 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio var waitingOriginalPath = false; while (start < end) { - var lineEnd = Array.IndexOf(buffer.Array, (byte)'\0', start); - var line = Encoding.UTF8.GetString(lineEnd < start ? buffer[start..] : buffer[start..lineEnd]); + var lineEnd = Array.IndexOf(buffer.Array, (byte)'\0', start, end - start); + var line = Encoding.UTF8.GetString(lineEnd < 0 ? buffer[start..] : buffer[start..lineEnd]); if (waitingOriginalPath) { if (outs.Count > 0) @@ -76,7 +76,7 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio outs.Add(change); } - if (lineEnd < start) + if (lineEnd < 0) break; start = lineEnd + 1; @@ -117,8 +117,8 @@ private static Models.Change ParseLine(string line, out bool hasOriginalPath) if (ordinary.Length != 9) return null; - var index = ParseState(line[2]); - var worktree = ParseState(line[3]); + var index = Models.Change.ParseState(line[2]); + var worktree = Models.Change.ParseState(line[3]); if (index == Models.ChangeState.None && worktree == Models.ChangeState.None) return null; @@ -132,16 +132,15 @@ private static Models.Change ParseLine(string line, out bool hasOriginalPath) // 2 - Renamed Change. The next line is the original path. if (ch == '2') { - hasOriginalPath = true; - var renamed = line.Split(' ', 10); if (renamed.Length != 10) return null; var change = new Models.Change(); change.Path = renamed[9]; - change.Index = ParseState(line[2]); - change.WorkTree = ParseState(line[3]); + change.Index = Models.Change.ParseState(line[2]); + change.WorkTree = Models.Change.ParseState(line[3]); + hasOriginalPath = true; return change; } @@ -172,20 +171,6 @@ private static Models.Change ParseLine(string line, out bool hasOriginalPath) return null; } - private static Models.ChangeState ParseState(char c) - { - return c switch - { - 'M' => Models.ChangeState.Modified, - 'T' => Models.ChangeState.TypeChanged, - 'A' => Models.ChangeState.Added, - 'D' => Models.ChangeState.Deleted, - 'R' => Models.ChangeState.Renamed, - 'C' => Models.ChangeState.Copied, - _ => Models.ChangeState.None, - }; - } - private class CapturedProcess { public Process Process { get; set; } = null; diff --git a/src/Commands/QueryStagedChangesWithAmend.cs b/src/Commands/QueryStagedChangesWithAmend.cs index 0cd420592e..94415d7c07 100644 --- a/src/Commands/QueryStagedChangesWithAmend.cs +++ b/src/Commands/QueryStagedChangesWithAmend.cs @@ -6,9 +6,9 @@ namespace SourceGit.Commands { public partial class QueryStagedChangesWithAmend : Command { - [GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{4,64}) [0-9a-f]{4,64} ([ADMT])\d{0,6}\t(.*)$")] + [GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{4,64}) [0-9a-f]{4,64} ([ADMT])\d{0,6}$")] private static partial Regex REG_FORMAT1(); - [GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{4,64}) [0-9a-f]{4,64} ([RC])\d{0,6}\t(.*\t.*)$")] + [GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{4,64}) [0-9a-f]{4,64} ([RC])\d{0,6}$")] private static partial Regex REG_FORMAT2(); public QueryStagedChangesWithAmend(string repo) @@ -29,21 +29,41 @@ public QueryStagedChangesWithAmend(string repo) return []; var parent = shas.Length > 1 ? shas[1] : Models.EmptyTreeHash.Guess(shas[0]); - Args = $"diff-index --cached -M {parent}"; + Args = $"diff-index --cached -M -z {parent}"; rs = ReadToEnd(); if (!rs.IsSuccess) return []; var changes = new List(); - var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); + var lines = rs.StdOut.Split('\0'); + var waitingForOriginalPath = false; + var waitingForPath = false; foreach (var line in lines) { - var match = REG_FORMAT2().Match(line); + if (waitingForOriginalPath) + { + if (changes.Count > 0) + changes[^1].OriginalPath = line; + + waitingForOriginalPath = false; + continue; + } + + if (waitingForPath) + { + if (changes.Count > 0) + changes[^1].Path = line; + + waitingForPath = false; + continue; + } + + var match = REG_FORMAT1().Match(line); if (match.Success) { var change = new Models.Change() { - Path = match.Groups[4].Value, + Index = Models.Change.ParseState(match.Groups[3].Value[0]), DataForAmend = new Models.ChangeDataForAmend() { FileMode = match.Groups[1].Value, @@ -51,18 +71,18 @@ public QueryStagedChangesWithAmend(string repo) ParentSHA = parent, }, }; - var type = match.Groups[3].Value; - change.Set(type == "R" ? Models.ChangeState.Renamed : Models.ChangeState.Copied); + changes.Add(change); + waitingForPath = true; continue; } - match = REG_FORMAT1().Match(line); + match = REG_FORMAT2().Match(line); if (match.Success) { var change = new Models.Change() { - Path = match.Groups[4].Value, + Index = Models.Change.ParseState(match.Groups[3].Value[0]), DataForAmend = new Models.ChangeDataForAmend() { FileMode = match.Groups[1].Value, @@ -71,23 +91,10 @@ public QueryStagedChangesWithAmend(string repo) }, }; - var type = match.Groups[3].Value; - switch (type) - { - case "A": - change.Set(Models.ChangeState.Added); - break; - case "D": - change.Set(Models.ChangeState.Deleted); - break; - case "M": - change.Set(Models.ChangeState.Modified); - break; - case "T": - change.Set(Models.ChangeState.TypeChanged); - break; - } changes.Add(change); + waitingForPath = true; + waitingForOriginalPath = true; + continue; } } diff --git a/src/Models/Change.cs b/src/Models/Change.cs index baf6e8500e..245b75d4d3 100644 --- a/src/Models/Change.cs +++ b/src/Models/Change.cs @@ -55,28 +55,19 @@ public class Change public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree]; public string IndexDesc => TYPE_DESCS[(int)Index]; - public void Set(ChangeState index, ChangeState workTree = ChangeState.None) + public static ChangeState ParseState(char ch) { - Index = index; - WorkTree = workTree; - - if (index == ChangeState.Renamed || index == ChangeState.Copied || workTree == ChangeState.Renamed) + return ch switch { - var parts = Path.Split('\t', 2); - if (parts.Length < 2) - parts = Path.Split(" -> ", 2); - if (parts.Length == 2) - { - OriginalPath = parts[0]; - Path = parts[1]; - } - } - - if (Path[0] == '"') - Path = Path.Substring(1, Path.Length - 2); - - if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"') - OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2); + 'M' => ChangeState.Modified, + 'T' => ChangeState.TypeChanged, + 'A' => ChangeState.Added, + 'D' => ChangeState.Deleted, + 'R' => ChangeState.Renamed, + 'C' => ChangeState.Copied, + '?' => ChangeState.Untracked, + _ => ChangeState.None, + }; } private static readonly string[] TYPE_DESCS = From 59fda12bc390814f21a2423979f3f8fb92cab460 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 20 Nov 2026 15:16:12 +0800 Subject: [PATCH 4/4] code_style: more safe code for `Array.IndexOf` --- src/Commands/CompareRevisions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs index 04104bf9f1..eb50d5ad51 100644 --- a/src/Commands/CompareRevisions.cs +++ b/src/Commands/CompareRevisions.cs @@ -52,7 +52,7 @@ public CompareRevisions(string repo, string start, string end, string path) while (start < end) { - var lineEnd = Array.IndexOf(buffer.Array, (byte)'\0', start); + var lineEnd = Array.IndexOf(buffer.Array, (byte)'\0', start, end - start); var line = Encoding.UTF8.GetString(lineEnd < 0 ? buffer[start..] : buffer[start..lineEnd]); if (waitingOriginalPath)