Skip to content

Commit

Permalink
modified patch to include line numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
Siddhi-agg committed Apr 3, 2024
1 parent 65b6e3f commit 381dd96
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions vendor/patch/src/patch.ml
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,30 @@ type hunk = {
}

let unified_diff hunk =
let left_line_num = ref hunk.their_start in
let right_line_num = ref hunk.mine_start in
let incr ref =
ref := !ref + 1
in
(* TODO *)
String.concat "\n"
(List.map
(function
| `Common line -> " " ^ line
| `Mine line -> "- " ^ line
| `Their line -> "+ " ^ line)
| `Common line ->
incr left_line_num;
incr right_line_num;
(Printf.sprintf "%d " !left_line_num) ^ (Printf.sprintf "%d " !right_line_num) ^ line
| `Their line ->
incr right_line_num;
" " ^ (Printf.sprintf "%d + " !right_line_num) ^ line
| `Mine line ->
incr left_line_num;
(Printf.sprintf "%d - " !left_line_num) ^ line)
hunk.lines)

let pp_hunk ppf hunk =
Format.fprintf ppf "@@@@ -%d,%d +%d,%d @@@@\n%s"
hunk.mine_start hunk.mine_len hunk.their_start hunk.their_len
(hunk.mine_start+1) hunk.mine_len (hunk.their_start+1) hunk.their_len
(unified_diff hunk)

let take data num =
Expand Down

0 comments on commit 381dd96

Please sign in to comment.