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

fix: parsing copied change (#2174)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-03-10 17:11:24 +08:00
parent 75a82fae03
commit baf85af7c0
5 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Commands/CompareRevisions.cs
View File

@@ -7,9 +7,9 @@ namespace SourceGit.Commands
{
public partial class CompareRevisions : Command
{
[GeneratedRegex(@"^([MADC])\s+(.+)$")]
[GeneratedRegex(@"^([MAD])\s+(.+)$")]
private static partial Regex REG_FORMAT();
[GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
[GeneratedRegex(@"^([CR])[0-9]{0,4}\s+(.+)$")]
private static partial Regex REG_RENAME_FORMAT();
public CompareRevisions(string repo, string start, string end)
@@ -47,8 +47,9 @@ namespace SourceGit.Commands
match = REG_RENAME_FORMAT().Match(line);
if (match.Success)
{
var renamed = new Models.Change() { Path = match.Groups[1].Value };
renamed.Set(Models.ChangeState.Renamed);
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);
}
@@ -72,10 +73,6 @@ namespace SourceGit.Commands
change.Set(Models.ChangeState.Deleted);
changes.Add(change);
break;
case 'C':
change.Set(Models.ChangeState.Copied);
changes.Add(change);
break;
}
}

14
src/Commands/QueryFileHistory.cs
View File

@@ -8,9 +8,9 @@ namespace SourceGit.Commands
{
public partial class QueryFileHistory : Command
{
[GeneratedRegex(@"^([MADC])\s+(.+)$")]
[GeneratedRegex(@"^([MAD])\s+(.+)$")]
private static partial Regex REG_FORMAT();
[GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
[GeneratedRegex(@"^([CR])[0-9]{0,4}\s+(.+)$")]
private static partial Regex REG_RENAME_FORMAT();
public QueryFileHistory(string repo, string path, string head)
@@ -20,7 +20,7 @@ namespace SourceGit.Commands
RaiseError = false;
var builder = new StringBuilder();
builder.Append("log --follow --no-show-signature --date-order -n 10000 --decorate=no --format=\"@%H%x00%P%x00%aN±%aE%x00%at%x00%s\" --name-status ");
builder.Append("log --no-show-signature --date-order -n 10000 --decorate=no --format=\"@%H%x00%P%x00%aN±%aE%x00%at%x00%s\" --follow --name-status ");
if (!string.IsNullOrEmpty(head))
builder.Append(head).Append(" ");
builder.Append("-- ").Append(path.Quoted());
@@ -64,8 +64,9 @@ namespace SourceGit.Commands
match = REG_RENAME_FORMAT().Match(line);
if (match.Success)
{
last.Change.Path = match.Groups[1].Value;
last.Change.Set(Models.ChangeState.Renamed);
var type = match.Groups[1].Value;
last.Change.Path = match.Groups[2].Value;
last.Change.Set(type == "R" ? Models.ChangeState.Renamed : Models.ChangeState.Copied);
}
continue;
@@ -85,9 +86,6 @@ namespace SourceGit.Commands
case 'D':
last.Change.Set(Models.ChangeState.Deleted);
break;
case 'C':
last.Change.Set(Models.ChangeState.Copied);
break;
}
}
}

12
src/Commands/QueryStagedChangesWithAmend.cs
View File

@@ -6,9 +6,9 @@ namespace SourceGit.Commands
{
public partial class QueryStagedChangesWithAmend : Command
{
[GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} ([ACDMT])\d{0,6}\t(.*)$")]
[GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} ([ADMT])\d{0,6}\t(.*)$")]
private static partial Regex REG_FORMAT1();
[GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} R\d{0,6}\t(.*\t.*)$")]
[GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} ([RC])\d{0,6}\t(.*\t.*)$")]
private static partial Regex REG_FORMAT2();
public QueryStagedChangesWithAmend(string repo, string parent)
@@ -34,7 +34,7 @@ namespace SourceGit.Commands
{
var change = new Models.Change()
{
Path = match.Groups[3].Value,
Path = match.Groups[4].Value,
DataForAmend = new Models.ChangeDataForAmend()
{
FileMode = match.Groups[1].Value,
@@ -42,7 +42,8 @@ namespace SourceGit.Commands
ParentSHA = _parent,
},
};
change.Set(Models.ChangeState.Renamed);
var type = match.Groups[3].Value;
change.Set(type == "R" ? Models.ChangeState.Renamed : Models.ChangeState.Copied);
changes.Add(change);
continue;
}
@@ -67,9 +68,6 @@ namespace SourceGit.Commands
case "A":
change.Set(Models.ChangeState.Added);
break;
case "C":
change.Set(Models.ChangeState.Copied);
break;
case "D":
change.Set(Models.ChangeState.Deleted);
break;

2
src/Models/Change.cs
View File

@@ -60,7 +60,7 @@
Index = index;
WorkTree = workTree;
if (index == ChangeState.Renamed || workTree == ChangeState.Renamed)
if (index == ChangeState.Renamed || index == ChangeState.Copied || workTree == ChangeState.Renamed)
{
var parts = Path.Split('\t', 2);
if (parts.Length < 2)

18
src/Models/DiffOption.cs
View File

@@ -86,10 +86,20 @@ namespace SourceGit.Models
/// <param name="ver"></param>
public DiffOption(FileVersion ver)
{
_revisions.Add(ver.HasParent ? $"{ver.SHA}^" : Commit.EmptyTreeSHA1);
_revisions.Add(ver.SHA);
_path = ver.Path;
_orgPath = ver.Change.OriginalPath;
if (string.IsNullOrEmpty(ver.Change.OriginalPath))
{
_revisions.Add(ver.HasParent ? $"{ver.SHA}^" : Commit.EmptyTreeSHA1);
_revisions.Add(ver.SHA);
_path = ver.Path;
}
else
{
_revisions.Add($"{ver.SHA}^:{ver.Change.OriginalPath.Quoted()}");
_revisions.Add($"{ver.SHA}:{ver.Path.Quoted()}");
_path = ver.Path;
_orgPath = ver.Change.OriginalPath;
_ignorePaths = true;
}
}
/// <summary>