Skip to content

Commit 9553674

Browse files
gadfly3173gadfly3173
committed
Merge 409ca38 into fix/file-rename
2 parents cd009bd + 409ca38 commit 9553674

6 files changed

Lines changed: 420 additions & 93 deletions

File tree

‎src/Commands/CompareRevisions.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial class CompareRevisions : Command
88
{
99
[GeneratedRegex(@"^([MADC])\s+(.+)$")]
1010
private static partial Regex REG_FORMAT();
11-
[GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
11+
[GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)\s+(.+)$")]
1212
private static partial Regex REG_RENAME_FORMAT();
1313

1414
public CompareRevisions(string repo, string start, string end)
@@ -51,7 +51,11 @@ private void ParseLine(string line)
5151
match = REG_RENAME_FORMAT().Match(line);
5252
if (match.Success)
5353
{
54-
var renamed = new Models.Change() { Path = match.Groups[1].Value };
54+
var renamed = new Models.Change()
55+
{
56+
OriginalPath = match.Groups[1].Value,
57+
Path = match.Groups[2].Value
58+
};
5559
renamed.Set(Models.ChangeState.Renamed);
5660
_changes.Add(renamed);
5761
}

‎src/Commands/QueryCommits.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
4343
}
4444
else if (method == Models.CommitSearchMethod.ByFile)
4545
{
46-
search += $"-- \"{filter}\"";
46+
search += $"--follow -- \"{filter}\"";
4747
}
4848
else
4949
{

‎src/Commands/QueryFilePathInRevision.cs‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text.RegularExpressions;
4+
5+
namespace SourceGit.Commands
6+
{
7+
public partial class QueryFilePathInRevision : Command
8+
{
9+
[GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)\s+(.+)$")]
10+
private static partial Regex REG_RENAME_FORMAT();
11+
12+
public QueryFilePathInRevision(string repo, string revision, string currentPath)
13+
{
14+
WorkingDirectory = repo;
15+
Context = repo;
16+
_revision = revision;
17+
_currentPath = currentPath;
18+
}
19+
20+
public string Result()
21+
{
22+
if (CheckPathExistsInRevision(_currentPath))
23+
return _currentPath;
24+
25+
string mappedPath = FindRenameHistory();
26+
return mappedPath ?? _currentPath;
27+
}
28+
29+
private bool CheckPathExistsInRevision(string path)
30+
{
31+
Args = $"ls-tree -r {_revision} -- \"{path}\"";
32+
var rs = ReadToEnd();
33+
return rs.IsSuccess && !string.IsNullOrEmpty(rs.StdOut);
34+
}
35+
36+
private string FindRenameHistory()
37+
{
38+
var fileHistory = BuildFileHistory();
39+
if (fileHistory == null || fileHistory.Count == 0)
40+
return null;
41+
42+
foreach (var entry in fileHistory)
43+
{
44+
if (!IsTargetRevisionBefore(entry.CommitSHA))
45+
continue;
46+
47+
if (CheckPathExistsInRevision(entry.OldPath))
48+
return entry.OldPath;
49+
}
50+
51+
if (fileHistory.Count > 0)
52+
{
53+
var oldestPath = fileHistory[^1].OldPath;
54+
if (CheckPathExistsInRevision(oldestPath))
55+
return oldestPath;
56+
}
57+
58+
return null;
59+
}
60+
61+
private bool IsTargetRevisionBefore(string commitSHA)
62+
{
63+
Args = $"merge-base --is-ancestor {_revision} {commitSHA}";
64+
var rs = ReadToEnd();
65+
return rs.IsSuccess;
66+
}
67+
68+
private List<RenameHistoryEntry> BuildFileHistory()
69+
{
70+
Args = $"log --follow --name-status --pretty=format:\"commit %H\" -M -- \"{_currentPath}\"";
71+
var rs = ReadToEnd();
72+
if (!rs.IsSuccess)
73+
return null;
74+
75+
var result = new List<RenameHistoryEntry>();
76+
var lines = rs.StdOut.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
77+
78+
string currentCommit = null;
79+
string currentPath = _currentPath;
80+
81+
foreach (var t in lines)
82+
{
83+
var line = t.Trim();
84+
85+
if (line.StartsWith("commit ", StringComparison.Ordinal))
86+
{
87+
currentCommit = line.Substring("commit ".Length);
88+
continue;
89+
}
90+
91+
var match = REG_RENAME_FORMAT().Match(line);
92+
if (match.Success && currentCommit != null)
93+
{
94+
var oldPath = match.Groups[1].Value;
95+
var newPath = match.Groups[2].Value;
96+
97+
if (newPath == currentPath)
98+
{
99+
result.Add(new RenameHistoryEntry
100+
{
101+
CommitSHA = currentCommit,
102+
OldPath = oldPath,
103+
NewPath = newPath
104+
});
105+
106+
currentPath = oldPath;
107+
}
108+
}
109+
}
110+
111+
return result;
112+
}
113+
114+
private class RenameHistoryEntry
115+
{
116+
public string CommitSHA { get; set; }
117+
public string OldPath { get; set; }
118+
public string NewPath { get; set; }
119+
}
120+
121+
private readonly string _revision;
122+
private readonly string _currentPath;
123+
}
124+
}

‎src/Models/Change.cs‎

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Collections.Generic;
23

34
namespace SourceGit.Models
45
{
@@ -9,17 +10,18 @@ public enum ChangeViewMode
910
Tree,
1011
}
1112

13+
[Flags]
1214
public enum ChangeState
1315
{
14-
None,
15-
Modified,
16-
TypeChanged,
17-
Added,
18-
Deleted,
19-
Renamed,
20-
Copied,
21-
Untracked,
22-
Conflicted,
16+
None = 0,
17+
Modified = 1 << 0,
18+
TypeChanged = 1 << 1,
19+
Added = 1 << 2,
20+
Deleted = 1 << 3,
21+
Renamed = 1 << 4,
22+
Copied = 1 << 5,
23+
Untracked = 1 << 6,
24+
Conflicted = 1 << 7,
2325
}
2426

2527
public enum ConflictReason
@@ -54,8 +56,8 @@ public class Change
5456
public string ConflictMarker => CONFLICT_MARKERS[(int)ConflictReason];
5557
public string ConflictDesc => CONFLICT_DESCS[(int)ConflictReason];
5658

57-
public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree];
58-
public string IndexDesc => TYPE_DESCS[(int)Index];
59+
public string WorkTreeDesc => TYPE_DESCS[GetPrimaryState(WorkTree)];
60+
public string IndexDesc => TYPE_DESCS[GetPrimaryState(Index)];
5961

6062
public void Set(ChangeState index, ChangeState workTree = ChangeState.None)
6163
{
@@ -88,18 +90,43 @@ public void Set(ChangeState index, ChangeState workTree = ChangeState.None)
8890
OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2);
8991
}
9092

91-
private static readonly string[] TYPE_DESCS =
92-
[
93-
"Unknown",
94-
"Modified",
95-
"Type Changed",
96-
"Added",
97-
"Deleted",
98-
"Renamed",
99-
"Copied",
100-
"Untracked",
101-
"Conflict"
102-
];
93+
public static ChangeState GetPrimaryState(ChangeState state)
94+
{
95+
if (state == ChangeState.None)
96+
return ChangeState.None;
97+
if ((state & ChangeState.Conflicted) != 0)
98+
return ChangeState.Conflicted;
99+
if ((state & ChangeState.Untracked) != 0)
100+
return ChangeState.Untracked;
101+
if ((state & ChangeState.Renamed) != 0)
102+
return ChangeState.Renamed;
103+
if ((state & ChangeState.Copied) != 0)
104+
return ChangeState.Copied;
105+
if ((state & ChangeState.Deleted) != 0)
106+
return ChangeState.Deleted;
107+
if ((state & ChangeState.Added) != 0)
108+
return ChangeState.Added;
109+
if ((state & ChangeState.TypeChanged) != 0)
110+
return ChangeState.TypeChanged;
111+
if ((state & ChangeState.Modified) != 0)
112+
return ChangeState.Modified;
113+
114+
return ChangeState.None;
115+
}
116+
117+
private static readonly Dictionary<ChangeState, string> TYPE_DESCS = new Dictionary<ChangeState, string>
118+
{
119+
{ ChangeState.None, "Unknown" },
120+
{ ChangeState.Modified, "Modified" },
121+
{ ChangeState.TypeChanged, "Type Changed" },
122+
{ ChangeState.Added, "Added" },
123+
{ ChangeState.Deleted, "Deleted" },
124+
{ ChangeState.Renamed, "Renamed" },
125+
{ ChangeState.Copied, "Copied" },
126+
{ ChangeState.Untracked, "Untracked" },
127+
{ ChangeState.Conflicted, "Conflict" }
128+
};
129+
103130
private static readonly string[] CONFLICT_MARKERS =
104131
[
105132
string.Empty,

0 commit comments

Comments
 (0)