Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace every use of GNU Patch by the OCaml patch library #5892

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

kit-ty-kate
Copy link
Member

@kit-ty-kate kit-ty-kate commented Mar 20, 2024

Fixes #6019
Fixes #3782 by removing any handling of chmod entirely (git extensions). Every patched files keep their permissions and every new file has the default file permission (644).
Fixes ocaml/setup-ocaml#933
see #5891

A large amount of work was necessary in the patch library to make this work. See hannesm/patch#9, hannesm/patch#7 and especially hannesm/patch#22

Moving the logic of OpamSystem.translate_patch into patch can be done later. Possibly during the 2.4 alpha phase.
The 2.4 alpha phase will also serve to test this new version of patch (3.0.0), once it has been sufficiently tested the stable release of patch.3.0.0 will be published.

@kit-ty-kate kit-ty-kate added the PR: WIP Not for merge at this stage label Mar 20, 2024
@kit-ty-kate
Copy link
Member Author

Could be coupled with ocaml-patch's implementation of diff via hannesm/patch#12

@kit-ty-kate kit-ty-kate force-pushed the internal-patch-for-repositories branch from 47f9c1e to d83fd0b Compare March 27, 2024 15:15
@kit-ty-kate kit-ty-kate added this to the 2.4.0~alpha1 milestone Sep 27, 2024
@kit-ty-kate kit-ty-kate force-pushed the internal-patch-for-repositories branch from 2841797 to 6a05509 Compare October 11, 2024 12:22
@kit-ty-kate kit-ty-kate force-pushed the internal-patch-for-repositories branch from 10a485e to 6da29f1 Compare February 15, 2025 03:25
@kit-ty-kate kit-ty-kate changed the title Apply patches when dealing with repositories via an OCaml implementation of patch Replace every use of GNU Patch by the OCaml patch library Mar 2, 2025
@kit-ty-kate kit-ty-kate force-pushed the internal-patch-for-repositories branch from 6d73281 to d133309 Compare March 10, 2025 17:40
@kit-ty-kate kit-ty-kate marked this pull request as ready for review March 10, 2025 17:40
@kit-ty-kate kit-ty-kate removed the PR: WIP Not for merge at this stage label Mar 11, 2025
@kit-ty-kate kit-ty-kate requested a review from rjbou March 11, 2025 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

gpatch @ macos GNU patch < 2.7.6 doesn't apply executable bit correctly
1 participant