Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 60 additions & 39 deletions src/Commands/CompareRevisions.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
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 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)
Expand All @@ -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)
Expand All @@ -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<List<Models.Change>> ReadAsync()
Expand All @@ -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
Expand Down
36 changes: 10 additions & 26 deletions src/Commands/QueryFileHistory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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]);
}
}
}
Expand Down
Loading
Loading