just-mr: rework progress reporting and statistics

To avoid unnecessary work, just-mr uses on-disk caches, including
for the mapping of a distdir to the corresponding git tree. This,
however, implies that the number of repositories that are actually
considered varies: in order to fetch a distdir repository, all
involved archives have to be fetched, but if we have a cache hit
none of them is even looked at.

So, in order to have a consistent reporting only count top-level
targets (i.e., the reachable repositories) in the statistics,
not the archives implicitly contained in a distdir, nor low-level
sub tasks. The actual fetch acitvity is shown separately by the
task tracker.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/other_tools/root_maps/distdir_git_map.hpp b/src/other_tools/root_maps/distdir_git_map.hpp
index 8f7796e3..c440253b 100644
--- a/src/other_tools/root_maps/distdir_git_map.hpp
+++ b/src/other_tools/root_maps/distdir_git_map.hpp
@@ -15,6 +15,8 @@
 #ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP
 #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP
 
+#include <utility>
+
 #include "nlohmann/json.hpp"
 #include "src/other_tools/ops_maps/content_cas_map.hpp"
 #include "src/other_tools/ops_maps/import_to_git_map.hpp"
@@ -33,8 +35,10 @@ struct DistdirInfo {
 };
 
 /// \brief Maps a list of repositories belonging to a distdir to its
-/// corresponding workspace root.
-using DistdirGitMap = AsyncMapConsumer<DistdirInfo, nlohmann::json>;
+/// corresponding workspace root and indication whether this was a cache
+/// hit.
+using DistdirGitMap =
+    AsyncMapConsumer<DistdirInfo, std::pair<nlohmann::json, bool>>;
 
 [[nodiscard]] auto CreateDistdirGitMap(
     gsl::not_null<ContentCASMap*> const& content_cas_map,
@@ -52,4 +56,4 @@ struct hash<DistdirInfo> {
 };
 }  // namespace std
 
-#endif  // INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP
\ No newline at end of file
+#endif  // INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP