diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-13 10:16:29 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-18 12:05:10 +0200 |
| commit | dc9a7b8499da9ce7a90546afecd048d0bfb31f38 (patch) | |
| tree | efc036d485bb8418ffbf77957be2d5f2252a9306 /src/other_tools/root_maps/fpath_git_map.cpp | |
| parent | d08e6f1af5a96818c9e7c2c9e0a6288470489822 (diff) | |
| download | justbuild-dc9a7b8499da9ce7a90546afecd048d0bfb31f38.tar.gz | |
Make ServeApi a general class, not a singleton
...and adjust interfaces.
Diffstat (limited to 'src/other_tools/root_maps/fpath_git_map.cpp')
| -rw-r--r-- | src/other_tools/root_maps/fpath_git_map.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp index 913c3db7..6fa4b183 100644 --- a/src/other_tools/root_maps/fpath_git_map.cpp +++ b/src/other_tools/root_maps/fpath_git_map.cpp @@ -37,7 +37,7 @@ void CheckServeAndSetRoot( std::string const& tree_id, std::string const& repo_root, bool absent, - std::optional<gsl::not_null<const ServeApi*>> const& serve, + std::optional<ServeApi> const& serve, std::optional<gsl::not_null<IExecutionApi*>> const& remote_api, FilePathGitMap::SetterPtr const& ws_setter, FilePathGitMap::LoggerPtr const& logger) { @@ -45,7 +45,7 @@ void CheckServeAndSetRoot( // be able to build against it. If root is not absent, do not fail if we // don't have a suitable remote endpoint, but warn user nonetheless. if (serve) { - auto has_tree = CheckServeHasAbsentRoot(**serve, tree_id, logger); + auto has_tree = CheckServeHasAbsentRoot(*serve, tree_id, logger); if (not has_tree) { return; // fatal } @@ -63,7 +63,7 @@ void CheckServeAndSetRoot( } } else { - if (not EnsureAbsentRootOnServe(**serve, + if (not EnsureAbsentRootOnServe(*serve, tree_id, repo_root, &(*remote_api.value()), @@ -101,7 +101,7 @@ void ResolveFilePathTree( bool absent, gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map, gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map, - std::optional<gsl::not_null<const ServeApi*>> const& serve, + std::optional<ServeApi> const& serve, std::optional<gsl::not_null<IExecutionApi*>> const& remote_api, gsl::not_null<TaskSystem*> const& ts, FilePathGitMap::SetterPtr const& ws_setter, @@ -146,7 +146,7 @@ void ResolveFilePathTree( tree_hash, tree_id_file, absent, - serve, + &serve, remote_api, ts, ws_setter, @@ -187,7 +187,7 @@ void ResolveFilePathTree( [resolved_tree_id, tree_id_file, absent, - serve, + &serve, remote_api, ws_setter, logger](auto const& values) { @@ -255,7 +255,7 @@ auto CreateFilePathGitMap( gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map, gsl::not_null<ImportToGitMap*> const& import_to_git_map, gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map, - std::optional<gsl::not_null<const ServeApi*>> const& serve, + std::optional<ServeApi> const& serve, std::optional<gsl::not_null<IExecutionApi*>> const& remote_api, std::size_t jobs, std::string multi_repo_tool_name, @@ -264,7 +264,7 @@ auto CreateFilePathGitMap( critical_git_op_map, import_to_git_map, resolve_symlinks_map, - serve, + &serve, remote_api, multi_repo_tool_name, build_tool_name](auto ts, @@ -303,7 +303,7 @@ auto CreateFilePathGitMap( repo_root = std::move(*repo_root), critical_git_op_map, resolve_symlinks_map, - serve, + &serve, remote_api, ts, setter, @@ -363,7 +363,7 @@ auto CreateFilePathGitMap( absent, critical_git_op_map, resolve_symlinks_map, - serve, + &serve, remote_api, ts, setter, @@ -452,7 +452,7 @@ auto CreateFilePathGitMap( absent = key.absent, critical_git_op_map, resolve_symlinks_map, - serve, + &serve, remote_api, ts, setter, |