Apply patches when dealing with repositories via an OCaml implementation of patch #5892
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kit-ty-kate
commented
Mar 21, 2024
| let internal_patch ~dir p = | ||
| let fmt = Printf.sprintf in | ||
| let get_path file = | ||
| let dir = real_path dir in |
There was a problem hiding this comment.
Suggested change
| let dir = real_path dir in | |
| (* NOTE: Important to keep this `concat dir ""` to ensure the | |
| is_prefix_of doesn't match another directory *) | |
| let dir = Filename.concat (real_path dir) "" in |
|
Could be coupled with ocaml-patch's implementation of diff via hannesm/patch#12 |
kit-ty-kate
force-pushed
the
internal-patch-for-repositories
branch
from
47f9c1e
to
d83fd0b
Compare
kit-ty-kate
commented
Mar 27, 2024
| @@ -36,6 +36,7 @@ depends: [ | |||
| "sha" {>= "1.13"} | |||
| "jsonm" | |||
| "swhid_core" | |||
| "patch" {>= "1.0.1"} | |||
There was a problem hiding this comment.
Suggested change
| "patch" {>= "1.0.1"} | |
| "patch" {>= "2.0.0"} |
kit-ty-kate
commented
Mar 27, 2024
| log "Internal diff (empty) done in %.2fs." (chrono ()); | ||
| None | ||
| | diffs -> | ||
| log "Internal diff (non-empty) done in %.2fs." (chrono ()); |
There was a problem hiding this comment.
TODO: add a benchmark to show improvement before and after #5896
kit-ty-kate
commented
Apr 2, 2024
src/repository/opamGit.ml
Outdated
| @@ -205,7 +205,7 @@ module VCS : OpamVCS.VCS = struct | |||
| else if OpamSystem.file_is_empty patch_file then | |||
| (finalise (); Done None) | |||
| else | |||
| Done (Some (OpamFilename.of_string patch_file)) | |||
| Done (Some (OpamFilename.of_string patch_file, Patch.to_diffs ~p:1 (String.concat "\n" r.r_stdout))) | |||
There was a problem hiding this comment.
the use of Patch.to_diffs should be avoided in opam as long as the diff parser isn't complete and well tested.
Instead we can use OpamRepositoryBackend.get_diff, ignore all the changes in .git/.hg/.darcs and voilà (hopefully)
kit-ty-kate
commented
Apr 2, 2024
src/repository/opamVCS.mli
Outdated
| @@ -42,8 +42,9 @@ module type VCS = sig | |||
| val patch_applied: dirname -> url -> unit OpamProcess.job | |||
|
|
|||
| (** Returns the pending modifications in the form of a patch file, or None if | |||
| val diff: dirname -> url -> (filename * Patch.t list) option OpamProcess.job | |||
There was a problem hiding this comment.
Suggested change
| val diff: dirname -> url -> (filename * Patch.t list) option OpamProcess.job |
kit-ty-kate
force-pushed
the
internal-patch-for-repositories
branch
from
2841797
to
6a05509
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP
Fixes #6019
Fixes #3782
requires hannesm/patch#9
requires hannesm/patch#7
see #5891
cc @hannesm
TODO: