Plumb error reporting through registries interfaces. #1153
Merged
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
JavierMatosD
approved these changes
Aug 17, 2023
vicroms
reviewed
Aug 18, 2023
| @@ -162,8 +164,8 @@ namespace vcpkg | |||
| Path path, | |||
| std::string baseline); | |||
|
|
|||
| ExpectedL<std::vector<std::pair<SchemedVersion, std::string>>> get_builtin_versions(const VcpkgPaths& paths, | |||
| StringView port_name); | |||
| ExpectedL<Optional<std::vector<std::pair<SchemedVersion, std::string>>>> get_builtin_versions( | |||
There was a problem hiding this comment.
With these return types I'm grateful that auto exists.
There was a problem hiding this comment.
I thought the same thing when I looked at this lol
vicroms
approved these changes
Aug 25, 2023
ras0219-msft
approved these changes
Aug 25, 2023
| @@ -2741,6 +2734,7 @@ DECLARE_MESSAGE(VersionBuiltinPortTreeEntryMissing, | |||
| "{expected} and {actual} are versions like 1.0.", | |||
| "no version database entry for {package_name} at {expected}; using the checked out ports tree " | |||
| "version ({actual}).") | |||
| DECLARE_MESSAGE(VersionDatabaseEntriesMissing, (msg::package_name), "", "no version entries for {package_name}.") | |||
There was a problem hiding this comment.
Should this have a {url} as well?
There was a problem hiding this comment.
Turns out this message is not used; deleted
There was a problem hiding this comment.
This being in this PR is either merge gore or fallout from my other branch from which this PR was extracted and it will come back :)
src/vcpkg/paragraphs.cpp
Outdated
| error_info->error = msg::format_error(msgFailedToParseManifest, msg::path = manifest_path); | ||
| return error_info; | ||
| return ParseControlErrorInfo::from_error( | ||
| port_name, msg::format_error(msgFailedToParseManifest, msg::path = manifest_path)); |
There was a problem hiding this comment.
Noting that this should probably return the underlying filesystem error (permission denied) instead of a generic "failed to parse".
No change requested in this PR.
There was a problem hiding this comment.
The other place that used this message indeed included the original message, so I added it here.
src/vcpkg/registries.cpp
Outdated
Comment on lines
1626
to
1643
| auto maybe_maybe_versions = | ||
| load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_registry_versions, port_name); | ||
| auto maybe_versions = maybe_maybe_versions.get(); | ||
| if (!maybe_versions) | ||
| { | ||
| return std::move(maybe_maybe_versions).error(); | ||
| } | ||
|
|
||
| auto versions = maybe_versions->get(); | ||
| if (!versions) | ||
| { | ||
| return Optional<std::vector<std::pair<SchemedVersion, std::string>>>{}; | ||
| } | ||
|
|
||
| return Optional<std::vector<std::pair<SchemedVersion, std::string>>>{ | ||
| Util::fmap(*versions, [](const VersionDbEntry& entry) -> std::pair<SchemedVersion, std::string> { | ||
| return {SchemedVersion{entry.scheme, entry.version}, entry.git_tree}; | ||
| })}; |
There was a problem hiding this comment.
Suggested change
| auto maybe_maybe_versions = | |
| load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_registry_versions, port_name); | |
| auto maybe_versions = maybe_maybe_versions.get(); | |
| if (!maybe_versions) | |
| { | |
| return std::move(maybe_maybe_versions).error(); | |
| } | |
| auto versions = maybe_versions->get(); | |
| if (!versions) | |
| { | |
| return Optional<std::vector<std::pair<SchemedVersion, std::string>>>{}; | |
| } | |
| return Optional<std::vector<std::pair<SchemedVersion, std::string>>>{ | |
| Util::fmap(*versions, [](const VersionDbEntry& entry) -> std::pair<SchemedVersion, std::string> { | |
| return {SchemedVersion{entry.scheme, entry.version}, entry.git_tree}; | |
| })}; | |
| return | |
| load_versions_file(paths.get_filesystem(), VersionDbType::Git, paths.builtin_registry_versions, port_name).map([](const auto& maybe_versions) { | |
| return maybe_versions.map([](const auto& versions) { | |
| return Util::fmap(versions, [](const VersionDbEntry& entry) { | |
| return std::pair<SchemedVersion, std::string>{{entry.scheme, entry.version}, entry.git_tree}; | |
| })}; | |
| }); | |
| }); |
# Conflicts: # src/vcpkg/registries.cpp
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.
More prerequisites for git mktree.