Skip to content

Conversation

@kit-ty-kate
Copy link
Collaborator

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

Works as-is but isn't optimal.

Requires #14 to be merged first

@kit-ty-kate kit-ty-kate marked this pull request as ready for review March 22, 2024 22:47
@kit-ty-kate kit-ty-kate force-pushed the unified-diff branch 4 times, most recently from 1194dd0 to 58cd8bd Compare March 27, 2024 14:40
@kit-ty-kate kit-ty-kate marked this pull request as draft March 27, 2024 16:28
@kit-ty-kate kit-ty-kate marked this pull request as ready for review March 27, 2024 18:19
@hannesm
Copy link
Owner

hannesm commented Mar 27, 2024

This is a fine piece of code, but we will need some unit tests and other test cases to be able to maintain the code.

There may as well be some random testing: generate filea, generate fileb, run (our) diff filea fileb, test (patch filea (diff file fileb)) equals fileb

@kit-ty-kate
Copy link
Collaborator Author

Done. This PR should be ready to review

@kit-ty-kate
Copy link
Collaborator Author

CI should be good now

@hannesm hannesm merged commit 72181c0 into hannesm:main Apr 2, 2024
@hannesm
Copy link
Owner

hannesm commented Apr 2, 2024

Thanks!

@kit-ty-kate kit-ty-kate deleted the unified-diff branch April 2, 2024 18:37
hannesm added a commit to hannesm/opam-repository that referenced this pull request Apr 3, 2024
CHANGES:

* Add support for git format-patch headers (hannesm/patch#7 @kit-ty-kate)
* Pretty-printer: fix no_newline support (hannesm/patch#11 @kit-ty-kate)
* Various fixes to the diff parser ('---' mid diff, hunks, no newline at end
  of file) (hannesm/patch#10 @kit-ty-kate)
* Add Patch.pp_list (hannesm/patch#13 @kit-ty-kate)
* Merge Edit and Rename operations (hannesm/patch#14 @kit-ty-kate)
* Add a diff implementation (hannesm/patch#12 @kit-ty-kate)
* Rename to_diffs to parse (hannesm/patch#16 @kit-ty-kate)
* Provide API docs, tweak documentation (@hannesm)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants