diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-07-12 16:56:02 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-08-07 17:01:01 +0200 |
| commit | 19aa5015df60e0b9eccf1a93afb0d9776692f5d3 (patch) | |
| tree | 6eed9d8610926ae47af125d010141ed44bdfb12f /src/other_tools/repo_map | |
| parent | 25bc7b0388b0433cb4f0bfe2e546798cfaa024ab (diff) | |
| download | justbuild-19aa5015df60e0b9eccf1a93afb0d9776692f5d3.tar.gz | |
just-mr: Add map for pragma 'special' values
Moves away from literal strings in the async maps.
Diffstat (limited to 'src/other_tools/repo_map')
| -rw-r--r-- | src/other_tools/repo_map/repos_to_setup_map.cpp | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index 19dc7538..a07ebaa6 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -97,8 +97,10 @@ void GitCheckout(ExpressionPtr const& repo_desc, ? repo_desc_pragma->get()->At("special") : std::nullopt; auto pragma_special_value = - pragma_special and pragma_special->get()->IsString() - ? std::make_optional(pragma_special->get()->String()) + pragma_special and pragma_special->get()->IsString() and + kPragmaSpecialMap.contains(pragma_special->get()->String()) + ? std::make_optional( + kPragmaSpecialMap.at(pragma_special->get()->String())) : std::nullopt; // populate struct GitRepoInfo git_repo_info = { @@ -107,7 +109,7 @@ void GitCheckout(ExpressionPtr const& repo_desc, .branch = repo_desc_branch->get()->String(), .subdir = subdir.empty() ? "." : subdir.string(), .origin = repo_name, - .ignore_special = pragma_special_value == "ignore"}; + .ignore_special = pragma_special_value == PragmaSpecial::Ignore}; // get the WS root as git tree commit_git_map->ConsumeAfterKeysReady( ts, @@ -185,8 +187,10 @@ void ArchiveCheckout(ExpressionPtr const& repo_desc, ? repo_desc_pragma->get()->At("special") : std::nullopt; auto pragma_special_value = - pragma_special and pragma_special->get()->IsString() - ? std::make_optional(pragma_special->get()->String()) + pragma_special and pragma_special->get()->IsString() and + kPragmaSpecialMap.contains(pragma_special->get()->String()) + ? std::make_optional( + kPragmaSpecialMap.at(pragma_special->get()->String())) : std::nullopt; // populate struct ArchiveRepoInfo archive_repo_info = { @@ -206,7 +210,7 @@ void ArchiveCheckout(ExpressionPtr const& repo_desc, .origin_from_distdir = false}, .repo_type = repo_type, .subdir = subdir.empty() ? "." : subdir.string(), - .ignore_special = pragma_special_value == "ignore"}; + .ignore_special = pragma_special_value == PragmaSpecial::Ignore}; // get the WS root as git tree content_git_map->ConsumeAfterKeysReady( ts, @@ -266,8 +270,10 @@ void FileCheckout(ExpressionPtr const& repo_desc, ? repo_desc_pragma->get()->At("special") : std::nullopt; auto pragma_special_value = - pragma_special and pragma_special->get()->IsString() - ? std::make_optional(pragma_special->get()->String()) + pragma_special and pragma_special->get()->IsString() and + kPragmaSpecialMap.contains(pragma_special->get()->String()) + ? std::make_optional( + kPragmaSpecialMap.at(pragma_special->get()->String())) : std::nullopt; // check "to_git" pragma auto pragma_to_git = @@ -276,7 +282,8 @@ void FileCheckout(ExpressionPtr const& repo_desc, pragma_to_git->get()->Bool()) { // get the WS root as git tree FpathInfo fpath_info = { - .fpath = fpath, .ignore_special = pragma_special_value == "ignore"}; + .fpath = fpath, + .ignore_special = pragma_special_value == PragmaSpecial::Ignore}; fpath_git_map->ConsumeAfterKeysReady( ts, {std::move(fpath_info)}, @@ -301,7 +308,7 @@ void FileCheckout(ExpressionPtr const& repo_desc, // get the WS root as filesystem location nlohmann::json cfg({}); cfg["workspace_root"] = - nlohmann::json::array({pragma_special_value == "ignore" + nlohmann::json::array({pragma_special_value == PragmaSpecial::Ignore ? FileRoot::kFileIgnoreSpecialMarker : "file", fpath.string()}); // explicit array @@ -572,15 +579,17 @@ void GitTreeCheckout(ExpressionPtr const& repo_desc, ? repo_desc_pragma->get()->At("special") : std::nullopt; auto pragma_special_value = - pragma_special and pragma_special->get()->IsString() - ? std::make_optional(pragma_special->get()->String()) + pragma_special and pragma_special->get()->IsString() and + kPragmaSpecialMap.contains(pragma_special->get()->String()) + ? std::make_optional( + kPragmaSpecialMap.at(pragma_special->get()->String())) : std::nullopt; // populate struct TreeIdInfo tree_id_info = { .hash = repo_desc_hash->get()->String(), .env_vars = std::move(env), .command = std::move(cmd), - .ignore_special = pragma_special_value == "ignore"}; + .ignore_special = pragma_special_value == PragmaSpecial::Ignore}; // get the WS root as git tree tree_id_git_map->ConsumeAfterKeysReady( ts, |