[API] Abstract over repository roots to simplify the addition of new repository formats #6680
Conversation
This file contains hidden or 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
rjbou
reviewed
Oct 9, 2025
Comment on lines
+2520
to
+2522
| let target = OpamRepositoryRoot.Dir.backup ~tmp_dir dir in | ||
| OpamRepositoryRoot.Dir.copy ~src:dir ~dst:target; | ||
| fun () -> OpamRepositoryRoot.Dir.copy ~src:target ~dst:dir) |
There was a problem hiding this comment.
Why use Dir here instead of the abstraction OpamRepositoryRoot.t ?
There was a problem hiding this comment.
This code is guarded under the else branch of if OpamFilename.exists tar so in this case we know that we're working with directories
src/state/opamUpdate.ml
Outdated
Comment on lines
21
to
23
| let safe_read_repo_file = function | ||
| | OpamRepositoryRoot.Dir dir -> | ||
| OpamFile.Repo.safe_read (OpamRepositoryPath.repo dir) |
There was a problem hiding this comment.
better have this function is OpamRepositoryState (cf related comment in 6625)
There was a problem hiding this comment.
I used the already existing OpamRepositoryRoot.delayed_read_repo function instead
|
I've pushed some commits that contains some reviews proposals, left some comments. It is a very preliminary review comments, i still have some blind spot (that's why i refer to 6625 comments too). |
283ee7a to
17fd765
Compare
…s called everywhere
17fd765 to
baf0725
Compare
kit-ty-kate
added a commit
to kit-ty-kate/opam-rt
that referenced
this pull request
Oct 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Extracted from #6625
Queued on #6679To be merged at the same time as ocaml-opam/opam-rt#86
As mentioned in #6625, adding abstract types over repository roots allows us to simplify and ensure correctness when adding a new format of repository.
In its current form, this PR also changes a couple of unrelated thing that i failed to change back when extracting from #6625 (removal of some use and logic associated withOpamRepositoryConfig.repo_tarring) so it needs at least a cleanup before it is in a mergable state (on top of being queued on the already substantial #6679)