diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs index c7ee58915..eb50d5ad5 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, end - 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 5dca109a2..61f25c395 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 7c2e4156a..8069c4807 100644 --- a/src/Commands/QueryLocalChanges.cs +++ b/src/Commands/QueryLocalChanges.cs @@ -1,16 +1,14 @@ -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; 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 +18,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 +50,37 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio }); } - while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line) + using var ms = new MemoryStream(); + await proc.StandardOutput.BaseStream.CopyToAsync(ms, CancellationToken).ConfigureAwait(false); + + if (!CancellationToken.IsCancellationRequested && ms.TryGetBuffer(out var buffer)) { - var match = REG_FORMAT().Match(line); - if (!match.Success) - continue; + var start = buffer.Offset; + var end = buffer.Offset + buffer.Count; + var waitingOriginalPath = false; + while (start < end) + { + 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) + outs[^1].OriginalPath = line; - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; + waitingOriginalPath = false; + } + else if (line.Length >= 3) + { + var change = ParseLine(line, out waitingOriginalPath); + if (change != null) + outs.Add(change); + } - switch (status) - { - 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); + if (lineEnd < 0) 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); - break; - } - if (change.Index != Models.ChangeState.None || change.WorkTree != Models.ChangeState.None) - outs.Add(change); + start = lineEnd + 1; + } } lock (capturedLock) @@ -194,6 +96,81 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio return outs; } + private static Models.Change ParseLine(string line, out bool hasOriginalPath) + { + var ch = line[0]; + hasOriginalPath = false; + + // ? - Untracked files + if (ch == '?') + { + var change = new Models.Change(); + change.WorkTree = Models.ChangeState.Untracked; + change.Path = line.Substring(2); + return change; + } + + // 1 + if (ch == '1') + { + var ordinary = line.Split(' ', 9); + if (ordinary.Length != 9) + return null; + + 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; + + 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') + { + var renamed = line.Split(' ', 10); + if (renamed.Length != 10) + return null; + + var change = new Models.Change(); + change.Path = renamed[9]; + change.Index = Models.Change.ParseState(line[2]); + change.WorkTree = Models.Change.ParseState(line[3]); + hasOriginalPath = true; + 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 null; + } + private class CapturedProcess { public Process Process { get; set; } = null; diff --git a/src/Commands/QueryStagedChangesWithAmend.cs b/src/Commands/QueryStagedChangesWithAmend.cs index 0cd420592..94415d7c0 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 baf6e8500..245b75d4d 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 =