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

Internal repos-config new syntax #6393

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Feb 20, 2025

It is quite difficult and misleading to repository related information in the repos-config file (like in #4933 and #6283).
The current format contain a list with a some optional elements, which complicated the parsing

repositories: [ <string> { <URL> } { {<string>}+ } { <int> } ... ]: lists the configured repository idents, their URLs and trust anchors. The format is similar to repositories: from opamrc, except that the itself is optional.

The PR implements a new syntax for this file: each repository is a section with it's own defined labeled fields:

repo <string> {
  url: <URL>
  fingerprints:  <string>
  quorum: <int>
}

Adding then a new field is quite easy.

This change implies an hard upgrade (no best effort loading if read only) to update the opam root.

fix #6327

TODO:

Copy link
Member

@kit-ty-kate kit-ty-kate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be interested in a crash course on OpamPp at the next meeting to be able to understand the new Repos_configSyntax module better but overall otherwise that looks fine to me.

We might also want to discuss removing the soft/hard upgrade distinction.

Comment on lines +2076 to +2084
(fun ~pos:_ repos ->
let repos, errs = List.split repos in
let repos = List.filter_map Fun.id repos in
let map = OpamRepositoryName.Map.of_list repos in
let errs = List.flatten errs in
map, errs)
(fun (map, _errs) ->
OpamRepositoryName.Map.bindings map
|> List.map (fun x -> Some x, []))
Copy link
Member

@kit-ty-kate kit-ty-kate Feb 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two functions can be done more efficiently in one fold each


# Packages matching: any
# No matches found
### sh -c "rm OPAM/repo/state-*.cache"
### opam list -A
[WARNING] Errors in ${BASEDIR}/OPAM/repo/repos-config, some fields have been ignored:
- At ${BASEDIR}/OPAM/repo/repos-config:2:16-2:23::
expected url
- In ${BASEDIR}/OPAM/repo/repos-config:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reason we're loosing the position here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OpamFormat.section does not keep positions

@kit-ty-kate kit-ty-kate linked an issue Feb 21, 2025 that may be closed by this pull request
@rjbou rjbou added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Mar 12, 2025
@rjbou rjbou force-pushed the new-repos-config branch from 0e49b8f to 732f755 Compare March 12, 2025 18:28
@rjbou rjbou marked this pull request as ready for review March 12, 2025 18:28
Comment on lines +1153 to +1156
let v2_3 = OpamVersion.of_string "2.3"

let from_2_2_to_2_3 ~on_the_fly:_ _ conf = conf, gtc_none

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure that it is needed...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: QUEUED Pending pull request, waiting for other work to be merged or closed PR: WAITING FOR REVIEW
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update internal repos-config file format
2 participants