forked from CopilotC-Nvim/CopilotChat.nvim
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathdiff_spec.lua
More file actions
1043 lines (970 loc) · 27.4 KB
/
diff_spec.lua
File metadata and controls
1043 lines (970 loc) · 27.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
local diff = require('CopilotChat.utils.diff')
describe('CopilotChat.utils.diff', function()
it('applies unified diff', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context
-old
+new
]]
local original = { 'context', 'old', 'other' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'context', 'new', 'other' }, result)
end)
it('applies unified diff with no context', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
-old
+new
]]
local original = { 'old', 'other' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'new', 'other' }, result)
end)
it('applies unified diff with multiline edits', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context1
context2
-old1
-old2
+new1
+new2
]]
local original = {
'context1',
'context2',
'old1',
'old2',
'context3',
'other',
}
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({
'context1',
'context2',
'new1',
'new2',
'context3',
'other',
}, result)
end)
it('gets unified diff region', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context
-old
+new
]]
local original = { 'context', 'old', 'other' }
local original_content = table.concat(original, '\n')
local _, _, first, last = diff.apply_unified_diff(diff_text, original_content)
assert.equals(2, first)
assert.equals(2, last)
end)
it('applies unified diff with only additions', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context
+added1
+added2
]]
local original = { 'context', 'other' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'context', 'added1', 'added2', 'other' }, result)
end)
it('applies unified diff with only deletions', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context
-old1
-old2
]]
local original = { 'context', 'old1', 'old2', 'other' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'context', 'other' }, result)
end)
it('applies unified diff with changes at start and end', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
-oldstart
+newstart
context
-oldend
+newend
]]
local original = { 'oldstart', 'context', 'oldend' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'newstart', 'context', 'newend' }, result)
end)
it('applies unified diff with multiple hunks', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context1
-old1
+new1
@@ ... @@
context2
-old2
+new2
]]
local original = { 'context1', 'old1', 'context2', 'old2', 'other' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'context1', 'new1', 'context2', 'new2', 'other' }, result)
end)
it('applies unified diff with no changes', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context
unchanged
]]
local original = { 'context', 'unchanged' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same(original, result)
end)
it('applies unified diff with all lines deleted', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
-old1
-old2
-old3
]]
local original = { 'old1', 'old2', 'old3' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({}, result)
end)
it('applies unified diff with all lines added to empty file', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
+new1
+new2
+new3
]]
local original = {}
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'new1', 'new2', 'new3' }, result)
end)
it('applies unified diff with changes at end of file', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
context
-oldend
+newend
]]
local original = { 'context', 'oldend' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'context', 'newend' }, result)
end)
it('applies unified diff with changes at start of file', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ ... @@
-oldstart
+newstart
context
]]
local original = { 'oldstart', 'context' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'newstart', 'context' }, result)
end)
it('may confuse similar variable names', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,2 +1,2 @@
-local x = 1
+local x = 10
]]
local original = {
'local x = 1',
'local y = 2',
'local x = 3',
'local z = 4',
}
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({
'local x = 10',
'local y = 2',
'local x = 3',
'local z = 4',
}, result)
end)
it('may match wrong substring with partial matches', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,2 +1,2 @@
-old_value
+new_value
]]
local original = {
'value',
'old_value',
'very_old_value',
}
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_false(applied) -- not applied cleanly, but adjusted
assert.are.same({
'value',
'new_value',
'very_old_value',
}, result)
end)
it('may apply to wrong instance of identical boilerplate code', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,3 +1,3 @@
return {
- status = "old"
+ status = "new"
]]
local original = {
'return {',
' status = "old"',
'}',
'return {',
' status = "old"',
'}',
}
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({
'return {',
' status = "new"',
'}',
'return {',
' status = "old"',
'}',
}, result)
end)
it('allows adding at very start with zero original lines', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -0,0 +1,2 @@
+first
+second
]]
local original = { 'x', 'y' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'first', 'second', 'x', 'y' }, result)
end)
it('handles insertion at end without context', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -3,0 +4,2 @@
+new1
+new2
]]
local original = { 'a', 'b', 'c' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'a', 'b', 'c', 'new1', 'new2' }, result)
end)
it('supports multiple adjacent hunks modifying contiguous lines', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,1 +1,1 @@
-a
+x
@@ -2,1 +2,1 @@
-b
+y
]]
local original = { 'a', 'b', 'c' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'x', 'y', 'c' }, result)
end)
it('handles diff with trailing newline missing in original', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,1 +1,1 @@
-old
+new
]]
local original_content = 'old' -- no trailing newline
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'new' }, result)
end)
it('handles diff ending without newline on addition lines', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,1 +1,2 @@
old
+new]]
local original = { 'old' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'old', 'new' }, result)
end)
it('handles hunks with zero-context lines around changes', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -2,0 +3,1 @@
+added
]]
local original = { 'a', 'b', 'c' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'a', 'b', 'added', 'c' }, result)
end)
it('handles insertion of identical-to-context line', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,1 +1,2 @@
context
+context
]]
local original = { 'context', 'other' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({ 'context', 'context', 'other' }, result)
end)
it('rejects hunk with wrong header lengths', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,3 +1,3 @@
context
-old
+new
]]
local original = { 'context' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Fuzzy matching may still apply despite wrong header lengths
assert.is_not_nil(result)
end)
it('handles CRLF original with unix diff', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,1 +1,1 @@
-old
+new
]]
local original_content = 'old\r\n'
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.is_not_nil(result)
assert.is_true(#result >= 1)
end)
it('handles large insertion with no context', function()
local lines = {}
for i = 1, 10 do
table.insert(lines, '+line' .. i)
end
local diff_text = '--- a/foo.txt\n+++ b/foo.txt\n@@ -4,0 +5,10 @@\n' .. table.concat(lines, '\n') .. '\n'
local original = { 'a', 'b', 'c', 'd', 'e' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
local expected = { 'a', 'b', 'c', 'd' }
for i = 1, 10 do
table.insert(expected, 'line' .. i)
end
table.insert(expected, 'e')
assert.are.same(expected, result)
end)
it('rejects mismatched deletion ranges', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,3 +0,0 @@
-old1
-old2
-old3
]]
local original = { 'single' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Fuzzy matching may apply the deletion despite mismatch
assert.is_not_nil(result)
end)
it('handles mixed operations in one hunk', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,5 +1,4 @@
context1
-old
unchanged
-old2
+new2
context2
]]
local original = { 'context1', 'old', 'unchanged', 'old2', 'context2' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({ 'context1', 'unchanged', 'new2', 'context2' }, result)
end)
it('handles leading tabs/spaces inside context lines', function()
local diff_text = [[
--- a/x
+++ b/x
@@ -1,2 +1,2 @@
indented
-old
+new
]]
local original = { '\tindented', 'old' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({ '\tindented', 'new' }, result)
end)
it('respects diff markers even if content begins with + or -', function()
local diff_text = [[
--- a/x
+++ b/x
@@ -1,2 +1,2 @@
-+literalplus
--literalminus
++literalplus
++literalminus
]]
local original = { '+literalplus', '-literalminus' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({ '+literalplus', '+literalminus' }, result)
end)
it('applies diff despite slight context mismatch with fuzzy matching', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,3 +1,3 @@
slightly different context
-old
+new
]]
local original = { 'context', 'old', 'other' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Fuzzy matching will replace context lines that don't match
assert.are.same({ 'slightly different context', 'new', 'other' }, result)
end)
it('applies even when context is completely wrong due to fuzzy matching', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,3 +1,3 @@
totally wrong line
another wrong line
-old
+new
]]
local original = { 'context1', 'context2', 'old' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Fuzzy matching will replace all old_snippet lines (including wrong context) with new_snippet
assert.are.same({ 'totally wrong line', 'another wrong line', 'new' }, result)
end)
it('applies with partial context match', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -2,3 +2,3 @@
matching
-old
+new
]]
local original = { 'first', 'matching', 'old', 'last' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
assert.is_true(applied)
assert.are.same({ 'first', 'matching', 'new', 'last' }, result)
end)
it('handles context with extra lines not in original', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,5 +1,5 @@
context1
context2
context3
-old
+new
]]
local original = { 'context1', 'old' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Should fail or apply with fuzzy matching
assert.is_not_nil(result)
end)
it('fails when deletion target does not exist', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,2 +1,1 @@
context
-nonexistent
]]
local original = { 'context', 'actual' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Fuzzy matching might still apply or fail
assert.is_not_nil(result)
end)
it('applies when context lines are in different order', function()
local diff_text = [[
--- a/foo.txt
+++ b/foo.txt
@@ -1,3 +1,3 @@
line2
line1
-old
+new
]]
local original = { 'line1', 'line2', 'old' }
local result, applied = diff.apply_unified_diff(diff_text, table.concat(original, '\n'))
-- Fuzzy matching should handle reordered context
assert.is_not_nil(result)
end)
it('adds max_retry_time and cumulative retry logic', function()
local diff_text = [[
--- original.py
+++ modified.py
@@ -24,6 +24,7 @@
import time
retry_statuses = {HTTPStatus.TOO_MANY_REQUESTS, 502, 503, 504}
+ max_retry_time = 120 # Maximum cumulative retry time in seconds
retry_exceptions = (
httpx.ReadTimeout,
httpx.ConnectTimeout,
@@ -34,6 +35,7 @@
def deco(fn):
def wrapped(*args, **kwargs):
last_exc = None
+ total_retry_time = 0 # Track cumulative retry time
for attempt in range(retries):
try:
resp = fn(*args, **kwargs)
@@ -43,6 +45,9 @@
delay = min(max_backoff, backoff * (2**attempt)) * (
1 + random.random() * 0.25
)
+ if total_retry_time + delay > max_retry_time:
+ raise TimeoutError("Exceeded maximum retry time of 120 seconds")
+ total_retry_time += delay
time.sleep(delay)
continue
@@ -59,6 +64,9 @@
delay = min(max_backoff, backoff * (2**attempt)) * (
1 + random.random() * 0.25
)
+ if total_retry_time + delay > max_retry_time:
+ raise TimeoutError("Exceeded maximum retry time of 120 seconds")
+ total_retry_time += delay
time.sleep(delay)
continue
]]
local original = [[
import base64
import json
import logging
import os
import random
from datetime import datetime, time
from http import HTTPStatus
import geojson
import httpx
from cachetools import TTLCache, cached
from geopy.distance import geodesic
from shapely.geometry import MultiPolygon, Polygon, shape
logger = logging.getLogger(__name__)
httpx_client = httpx.Client(
timeout=10.0,
limits=httpx.Limits(max_keepalive_connections=20, max_connections=100),
)
def retry_request(retries=10, backoff=1, max_backoff=40.0):
import time
retry_statuses = {HTTPStatus.TOO_MANY_REQUESTS, 502, 503, 504}
retry_exceptions = (
httpx.ReadTimeout,
httpx.ConnectTimeout,
httpx.NetworkError, # includes transient connection errors
httpx.RemoteProtocolError,
)
def deco(fn):
def wrapped(*args, **kwargs):
last_exc = None
for attempt in range(retries):
try:
resp = fn(*args, **kwargs)
except retry_exceptions as exc:
last_exc = exc
# backoff and retry
delay = min(max_backoff, backoff * (2**attempt)) * (
1 + random.random() * 0.25
)
time.sleep(delay)
continue
# Retry on selected HTTP status
if resp.status_code in retry_statuses:
# honor Retry-After if present
ra = resp.headers.get("Retry-After")
if ra:
try:
delay = min(max_backoff, float(ra))
except ValueError:
delay = min(max_backoff, backoff * (2**attempt))
else:
delay = min(max_backoff, backoff * (2**attempt)) * (
1 + random.random() * 0.25
)
time.sleep(delay)
continue
return resp
if last_exc:
raise last_exc
return resp
return wrapped
return deco
]]
local expected = [[
import base64
import json
import logging
import os
import random
from datetime import datetime, time
from http import HTTPStatus
import geojson
import httpx
from cachetools import TTLCache, cached
from geopy.distance import geodesic
from shapely.geometry import MultiPolygon, Polygon, shape
logger = logging.getLogger(__name__)
httpx_client = httpx.Client(
timeout=10.0,
limits=httpx.Limits(max_keepalive_connections=20, max_connections=100),
)
def retry_request(retries=10, backoff=1, max_backoff=40.0):
import time
retry_statuses = {HTTPStatus.TOO_MANY_REQUESTS, 502, 503, 504}
max_retry_time = 120 # Maximum cumulative retry time in seconds
retry_exceptions = (
httpx.ReadTimeout,
httpx.ConnectTimeout,
httpx.NetworkError, # includes transient connection errors
httpx.RemoteProtocolError,
)
def deco(fn):
def wrapped(*args, **kwargs):
last_exc = None
total_retry_time = 0 # Track cumulative retry time
for attempt in range(retries):
try:
resp = fn(*args, **kwargs)
except retry_exceptions as exc:
last_exc = exc
# backoff and retry
delay = min(max_backoff, backoff * (2**attempt)) * (
1 + random.random() * 0.25
)
if total_retry_time + delay > max_retry_time:
raise TimeoutError("Exceeded maximum retry time of 120 seconds")
total_retry_time += delay
time.sleep(delay)
continue
# Retry on selected HTTP status
if resp.status_code in retry_statuses:
# honor Retry-After if present
ra = resp.headers.get("Retry-After")
if ra:
try:
delay = min(max_backoff, float(ra))
except ValueError:
delay = min(max_backoff, backoff * (2**attempt))
else:
delay = min(max_backoff, backoff * (2**attempt)) * (
1 + random.random() * 0.25
)
if total_retry_time + delay > max_retry_time:
raise TimeoutError("Exceeded maximum retry time of 120 seconds")
total_retry_time += delay
time.sleep(delay)
continue
return resp
if last_exc:
raise last_exc
return resp
return wrapped
return deco
]]
local result, applied = diff.apply_unified_diff(diff_text, original)
local expected_lines = vim.split(expected, '\n', { trimempty = true })
assert.are.same(expected_lines, result)
end)
-- Tests for offset tracking in sequential hunk application
it('correctly applies offset when first hunk adds lines', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -1,2 +1,4 @@
line1
+added1
+added2
line2
@@ -3,1 +5,1 @@
line3
]]
local original = { 'line1', 'line2', 'line3' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'line1', 'added1', 'added2', 'line2', 'line3' }, result)
end)
it('correctly applies offset when first hunk removes lines', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -1,3 +1,1 @@
line1
-line2
-line3
@@ -4,1 +2,1 @@
line4
]]
local original = { 'line1', 'line2', 'line3', 'line4' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'line1', 'line4' }, result)
end)
it('correctly tracks offset through multiple hunks with mixed add/remove', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -1,1 +1,2 @@
a
+b
@@ -2,1 +3,1 @@
-c
+C
@@ -3,1 +4,3 @@
d
+e
+f
]]
local original = { 'a', 'c', 'd' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'a', 'b', 'C', 'd', 'e', 'f' }, result)
end)
it('handles offset when hunks are far apart', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -2,1 +2,2 @@
line2
+inserted
@@ -10,1 +11,1 @@
-line10
+LINE10
]]
local original = {
'line1',
'line2',
'line3',
'line4',
'line5',
'line6',
'line7',
'line8',
'line9',
'line10',
}
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
local expected = {
'line1',
'line2',
'inserted',
'line3',
'line4',
'line5',
'line6',
'line7',
'line8',
'line9',
'LINE10',
}
assert.are.same(expected, result)
end)
it('applies three consecutive hunks with positive offset accumulation', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -1,1 +1,2 @@
a
+b
@@ -2,1 +3,2 @@
c
+d
@@ -3,1 +5,2 @@
e
+f
]]
local original = { 'a', 'c', 'e' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'a', 'b', 'c', 'd', 'e', 'f' }, result)
end)
it('applies three consecutive hunks with negative offset accumulation', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -1,2 +1,1 @@
-x
a
@@ -3,2 +2,1 @@
-y
b
@@ -5,2 +3,1 @@
-z
c
]]
local original = { 'x', 'a', 'y', 'b', 'z', 'c' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'a', 'b', 'c' }, result)
end)
it('handles zero-offset hunks (replacements without size change)', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -1,1 +1,1 @@
-old1
+new1
@@ -2,1 +2,1 @@
-old2
+new2
@@ -3,1 +3,1 @@
-old3
+new3
]]
local original = { 'old1', 'old2', 'old3' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'new1', 'new2', 'new3' }, result)
end)
it('applies offset correctly when first hunk is pure insertion (len_old=0)', function()
local diff_text = [[
--- a/test.txt
+++ b/test.txt
@@ -0,0 +1,2 @@
+inserted1
+inserted2
@@ -1,1 +3,1 @@
original
]]
local original = { 'original' }
local original_content = table.concat(original, '\n')
local result, applied = diff.apply_unified_diff(diff_text, original_content)
assert.is_true(applied)
assert.are.same({ 'inserted1', 'inserted2', 'original' }, result)
end)