fix: renamed files are missing in commit changes and stash changes (#1151)

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Commands/CompareRevisions.cs

@@ -6,8 +6,10 @@ namespace SourceGit.Commands
 {
     public partial class CompareRevisions : Command
     {
-        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
+        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
+        private static partial Regex REG_RENAME_FORMAT();
 
         public CompareRevisions(string repo, string start, string end)
         {
@@ -38,7 +40,17 @@ protected override void OnReadline(string line)
         {
             var match = REG_FORMAT().Match(line);
             if (!match.Success)
+            {
+                match = REG_RENAME_FORMAT().Match(line);
+                if (match.Success)
+                {
+                    var renamed = new Models.Change() { Path = match.Groups[1].Value };
+                    renamed.Set(Models.ChangeState.Renamed);
+                    _changes.Add(renamed);
+                }
+
                 return;
+            }
 
             var change = new Models.Change() { Path = match.Groups[2].Value };
             var status = match.Groups[1].Value;
@@ -57,10 +69,6 @@ protected override void OnReadline(string line)
                     change.Set(Models.ChangeState.Deleted);
                     _changes.Add(change);
                     break;
-                case 'R':
-                    change.Set(Models.ChangeState.Renamed);
-                    _changes.Add(change);
-                    break;
                 case 'C':
                     change.Set(Models.ChangeState.Copied);
                     _changes.Add(change);

src/Commands/QueryStashChanges.cs

@@ -9,8 +9,10 @@ namespace SourceGit.Commands
     /// </summary>
     public partial class QueryStashChanges : Command
     {
-        [GeneratedRegex(@"^([MADRC])\s+(.+)$")]
+        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
         private static partial Regex REG_FORMAT();
+        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
+        private static partial Regex REG_RENAME_FORMAT();
 
         public QueryStashChanges(string repo, string stash) 
         {
@@ -31,7 +33,17 @@ public QueryStashChanges(string repo, string stash)
             {
                 var match = REG_FORMAT().Match(line);
                 if (!match.Success)
+                {
+                    match = REG_RENAME_FORMAT().Match(line);
+                    if (match.Success)
+                    {
+                        var renamed = new Models.Change() { Path = match.Groups[1].Value };
+                        renamed.Set(Models.ChangeState.Renamed);
+                        outs.Add(renamed);
+                    }
+
                     continue;
+                }
 
                 var change = new Models.Change() { Path = match.Groups[2].Value };
                 var status = match.Groups[1].Value;
@@ -50,10 +62,6 @@ public QueryStashChanges(string repo, string stash)
                         change.Set(Models.ChangeState.Deleted);
                         outs.Add(change);
                         break;
-                    case 'R':
-                        change.Set(Models.ChangeState.Renamed);
-                        outs.Add(change);
-                        break;
                     case 'C':
                         change.Set(Models.ChangeState.Copied);
                         outs.Add(change);