Better cancellation handling

gitextensions · Sep 14, 2023 · 10f1e4c · 10f1e4c
1 parent c5bc5b3
commit 10f1e4c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -2162,10 +2162,19 @@ public IReadOnlyList<PatchFile> GetInteractiveRebasePatchFiles()
             bool isCurrentFound = false;
 
             RevisionReader reader = new(this, hasReflogSelector: false, allBodies: true);
-            CancellationTokenSource cts = new(TimeSpan.FromSeconds(15));
-            Dictionary<string, GitRevision> rebasedCommitsRevisions
-                = reader.GetRevisionsFromRange(todoCommitsInfos[0][1], todoCommitsInfos[^1][1], cts.Token)
+            CancellationTokenSource cts = new(TimeSpan.FromSeconds(30));
+            Dictionary<string, GitRevision> rebasedCommitsRevisions;
+
+            try
+            {
+                rebasedCommitsRevisions = reader.GetRevisionsFromRange(todoCommitsInfos[0][1], todoCommitsInfos[^1][1], cts.Token)
                     .ToDictionary(r => r.Guid, r => r);
+            }
+            catch (OperationCanceledException)
+            {
+                // If retrieve of commit range failed, fall back on getting data commit by commit
+                rebasedCommitsRevisions = new Dictionary<string, GitRevision>();
+            }
 
             foreach (string[] parts in todoCommitsInfos)
             {