Source file opamPatch.ml
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
let log ?level fmt = OpamConsole.log "PATCH" ?level fmt
let translate_patch ~dir orig corrected =
let strip_cr = OpamSystem.get_eol_encoding orig = Some true in
let ch =
try open_in_bin orig
with Sys_error _ -> raise (OpamSystem.File_not_found orig)
in
let result line =
match OpamStd.String.split line ' ' with
| "@@"::a::b::"@@"::_ ->
let l_a = String.length a in
let l_b = String.length b in
if l_a > 1 && l_b > 1 && a.[0] = '-' && b.[0] = '+' then
try
let f (_, v) = int_of_string v in
let neg =
OpamStd.String.cut_at (String.sub a 1 (l_a - 1)) ','
|> OpamStd.Option.map_default f 1
in
let pos =
OpamStd.String.cut_at (String.sub b 1 (l_b - 1)) ','
|> OpamStd.Option.map_default f 1
in
result neg pos
with e ->
OpamStd.Exn.fatal e;
`Header
else
`Header
| _ ->
`Header
in
let process_state_transition next_state state transforms =
match (state, next_state) with
| (`Processing _, `Processing _) ->
transforms
| (`Processing (_, target, crlf, patch_crlf, chunks, _), _) ->
let compute_transform patch_crlf =
let transform =
match (crlf, patch_crlf) with
| (None, _)
| (_, None) ->
log ~level:3 "CRLF adaptation skipped for %s" target;
None
| (Some crlf, Some patch_crlf) ->
if crlf = patch_crlf then begin
log ~level:3 "No CRLF adaptation necessary for %s" target;
None
end else if crlf then begin
log ~level:3 "Adding \\r to patch chunks for %s" target;
Some true
end else begin
log ~level:3 "Stripping \\r to patch chunks for %s" target;
Some false
end
in
let record_transform transform =
let augment_record (first_line, last_line) =
(first_line, last_line, transform)
in
List.rev_append (List.rev_map augment_record chunks) transforms
in
OpamStd.Option.map_default record_transform transforms transform
in
OpamStd.Option.map_default compute_transform transforms patch_crlf
| _ ->
transforms
in
let rec fold_lines state n transforms =
match input_line ch with
| line ->
let line =
if strip_cr then
String.sub line 0 (String.length line - 1)
else
line
in
let length = String.length line in
let next_state =
match state with
| `Header ->
begin
match (if length > 4 then String.sub line 0 4 else "") with
| "--- " ->
let file =
let file = String.sub line 4 (length - 4) in
let open OpamStd in
Option.map_default fst file (String.cut_at file '\t')
in
if file = "/dev/null" then
`NewHeader
else
let target =
OpamStd.String.cut_at (OpamSystem.back_to_forward file) '/'
|> OpamStd.Option.map_default snd file
|> Filename.concat dir
in
if Sys.file_exists target then
let crlf = OpamSystem.get_eol_encoding target in
`Patching (file, crlf)
else
`NewHeader
| "*** " ->
OpamConsole.warning "File %s uses context diffs which are \
less portable; consider using unified \
diffs" orig;
`SkipFile
| _ ->
`Header
end
| `NewHeader ->
if (if length > 4 then String.sub line 0 4 else "") = "+++ " then
`New
else
`Header
| `New ->
process_chunk_header (fun neg pos -> `NewChunk (neg, pos))
line
| `NewChunk (neg, pos) ->
let neg =
if line = "" || line.[0] = ' ' || line.[0] = '-' then
neg - 1
else
neg
in
let pos =
if line = "" || line.[0] = ' ' || line.[0] = '+' then
pos - 1
else
pos
in
if neg = 0 && pos = 0 then
`New
else
`NewChunk (neg, pos)
| `Patching (orig, crlf) ->
if (if length > 4 then String.sub line 0 4 else "") = "+++ " then
let file =
let file = String.sub line 4 (length - 4) in
let open OpamStd in
Option.map_default fst file (String.cut_at file '\t')
in
`Processing (orig, file, crlf, None, [], `Head)
else
`Header
| `Processing (orig, target, crlf, patch_crlf, chunks, `Head) ->
if line = "\\ No newline at end of file" then
let chunks =
match chunks with
| (a, b)::chunks ->
(a, b - 1)::chunks
| _ ->
chunks
in
`Processing (orig, target, crlf, patch_crlf, chunks, `Head)
else
process_chunk_header
(fun neg pos ->
`Processing (orig, target, crlf, patch_crlf, chunks,
`Chunk (succ n, neg, pos)))
line
| `Processing (orig, target, crlf, patch_crlf, chunks,
`Chunk (first_line, neg, pos)) ->
let neg =
if line = "" || line.[0] = ' ' || line.[0] = '-' then
neg - 1
else
neg
in
let pos =
if line = "" || line.[0] = ' ' || line.[0] = '+' then
pos - 1
else
pos
in
let patch_crlf =
let has_cr = (length > 0 && line.[length - 1] = '\r') in
match patch_crlf with
| None ->
Some (Some has_cr)
| Some (Some think_cr) when think_cr <> has_cr ->
log ~level:2 "Patch adaptation disabled for %s: \
mixed endings or binary file" target;
Some None
| _ ->
patch_crlf
in
if neg = 0 && pos = 0 then
let chunks = (first_line, n)::chunks in
`Processing (orig, target, crlf, patch_crlf, chunks, `Head)
else
`Processing (orig, target, crlf, patch_crlf, chunks,
`Chunk (first_line, neg, pos))
| `SkipFile ->
`SkipFile
in
if next_state = `SkipFile then
[]
else
process_state_transition next_state state transforms
|> fold_lines next_state (succ n)
| exception End_of_file ->
process_state_transition `Header state transforms |> List.rev
in
let transforms = fold_lines `Header 1 [] in
if transforms = [] then begin
log ~level:1 "No patch translation needed for %s -> %s" orig corrected;
OpamSystem.copy_file orig corrected
end else begin
seek_in ch 0;
log ~level:1 "Transforming patch %s to %s" orig corrected;
let ch_out =
try open_out_bin corrected
with Sys_error _ ->
close_in ch;
raise (OpamSystem.File_not_found corrected)
in
let (normal, add_cr, strip_cr) =
let strip n s = String.sub s 0 (String.length s - n) in
let id x = x in
if strip_cr then
(strip 1, id, strip 2)
else
(id, (fun s -> s ^ "\r"), strip 1)
in
if OpamConsole.debug () then begin
let log_transform (first_line, last_line, add_cr) =
let indicator = if add_cr then '+' else '-' in
log ~level:3 "Transform %d-%d %c\\r" first_line last_line indicator
in
List.iter log_transform transforms
end;
let rec fold_lines n transforms =
match input_line ch with
| line ->
let (f, transforms) =
match transforms with
| (first_line, last_line, add_cr_to_chunks)::next_transforms ->
let transforms =
if n = last_line then
next_transforms
else
transforms
in
let f =
if n >= first_line then
if add_cr_to_chunks then
add_cr
else
strip_cr
else
normal
in
(f, transforms)
| [] ->
(normal, [])
in
output_string ch_out (f line);
output_char ch_out '\n';
fold_lines (succ n) transforms
| exception End_of_file ->
close_out ch_out
in
fold_lines 1 transforms
end;
close_in ch
module type FS_ABSTR = sig
type root
type file
type target
val root_label : string
val translate_patch : bool
val root_to_string : root -> string
val file_to_string : file -> string
val equal_file: file -> file -> bool
val get_path : fail:(unit -> unit) -> root -> string -> file
val write : file -> string -> target -> target
val on_unclean_accept : file -> string option -> unit
val on_unclean_reject : file -> string option -> Patch.t -> unit
val exists : file -> target -> bool
val exists_dir : file -> target -> bool
val read : file -> target -> string
val remove : file -> target -> target
val remove_dir : file -> target -> target
val same_dirname : src:file -> dst:file -> bool
val mv : src:file -> dst:file -> target -> target
val open_ : root -> (target -> unit) -> unit
val save : target -> unit
end
exception Internal_patch_error of string
let patch_t (type a) (module FS : FS_ABSTR with type root = a)
~allow_unclean ?patch_filename (to_patch:a) diffs =
if diffs = [] then () else
let internal_patch_error fmt =
Printf.ksprintf (fun str -> raise (Internal_patch_error str)) fmt
in
let patch_info_path =
OpamStd.Option.default
(Printf.sprintf "in %s %s" FS.root_label (FS.root_to_string to_patch))
patch_filename
in
let get_path file =
let fail () =
internal_patch_error "Patch %S tried to escape its scope."
patch_info_path
in
FS.get_path ~fail to_patch file
in
let patch file content diff patching =
match Patch.patch ~cleanly:true content diff with
| Some x -> patching, x
| None -> assert false
| exception _ when not allow_unclean ->
internal_patch_error "Patch %S does not apply cleanly."
patch_info_path
| exception _ ->
match Patch.patch ~cleanly:false content diff with
| Some x ->
FS.on_unclean_accept file content;
patching, x
| None -> assert false
| exception _ ->
FS.on_unclean_reject file content diff;
internal_patch_error "Patch %S does not apply cleanly."
patch_info_path
in
let apply patching diff =
match diff.Patch.operation with
| Patch.Edit (file1, file2) ->
let file1 = get_path file1 in
let file2 = get_path file2 in
let file1_exists = FS.exists file1 patching in
let file = if file1_exists then file1 else file2 in
let content = FS.read file patching in
let patching, content = patch file (Some content) diff patching in
let patching = FS.write file content patching in
let patching =
if file1_exists && not (FS.equal_file file1 file2) then
FS.remove_dir file1 patching
else
patching
in
patching
| Patch.Delete file | Patch.Git_ext (file, _, Patch.Delete_only) ->
let file = get_path file in
let patching = FS.remove file patching in
let patching = FS.remove_dir file patching in
patching
| Patch.Create file | Patch.Git_ext (_, file, Patch.Create_only) ->
let file = get_path file in
let patching, content = patch file None diff patching in
let patching = FS.write file content patching in
patching
| Patch.Git_ext (_, _, Patch.Rename_only (src, dst)) ->
let src = get_path src in
let dst = get_path dst in
let patching = FS.mv ~src ~dst patching in
let patching =
if FS.same_dirname ~src ~dst then
patching
else
FS.remove_dir src patching
in
patching
in
FS.open_ to_patch (fun patching ->
let patched : FS.target = List.fold_left apply patching diffs in
FS.save patched)
let parse_patch ~translate file =
if not (Sys.file_exists file) then
(OpamConsole.error "Patch file %S not found." file;
raise Not_found);
let file' =
match translate with
| Some dir ->
let file' = OpamSystem.temp_file ~auto_clean:false "processed-patch" in
translate_patch ~dir file file';
file'
| None -> file
in
let content = OpamSystem.read file' in
Fun.protect (fun () -> Patch.parse ~p:1 content)
~finally:(fun () -> if not (OpamConsole.debug ()) then Sys.remove file')
let patch (type a) (module FS : FS_ABSTR with type root = a)
~allow_unclean patch_source (to_patch:a) =
let operations_result diffs =
Ok (List.map (fun d -> d.Patch.operation) diffs)
in
let patch ?patch_filename diffs =
patch_t (module FS) ~allow_unclean ?patch_filename to_patch diffs
in
try
match patch_source with
| `Patch_diffs diffs ->
patch diffs;
operations_result diffs
| `Patch_file p ->
let diffs =
let translate =
if FS.translate_patch then Some (FS.root_to_string to_patch)
else None
in
parse_patch ~translate p
in
patch ~patch_filename:p diffs;
operations_result diffs
with exn -> Error exn