From 8caa98644f69c9517e4819fd3301b84e4922ad14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= <reynir@reynir.dk>
Date: Mon, 7 Nov 2022 16:34:02 +0100
Subject: [PATCH] Nomenclature: duniverse dirs vs duniverse packages

We have duniverse (simple) directories and no version information.
---
 lib/views.ml         | 28 ++++++++++++++--------------
 opamdiff/opamdiff.ml |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/views.ml b/lib/views.ml
index a73bc07..de33ccd 100644
--- a/lib/views.ml
+++ b/lib/views.ml
@@ -809,11 +809,11 @@ let package_diffs diffs =
       ])
     diffs
 
-let duniverse_packages pkgs =
+let duniverse_dirs dirs =
   List.concat_map (fun p -> [
-        txtf "%a" Opamdiff.pp_duniverse_pkg p;
+        txtf "%a" Opamdiff.pp_duniverse_dir p;
         H.br ();
-      ]) pkgs
+      ]) dirs
 
 let duniverse_diffs diffs =
   List.concat_map (fun p -> [
@@ -860,7 +860,7 @@ let compare_builds
     ~(build_right : Builder_db.Build.t)
     ~env_diff:(added_env, removed_env, changed_env)
     ~pkg_diff:(added_pkgs, removed_pkgs, changed_pkgs)
-    ~opam_diff:(opam_diff, version_diff, left, right, duniverse_version_diff, duniverse_left, duniverse_right)
+    ~opam_diff:(opam_diff, version_diff, left, right, duniverse_content_diff, duniverse_left, duniverse_right)
   =
   layout
     ~nav:(`Comparison ((job_left, build_left), (job_right, build_right)))
@@ -922,7 +922,7 @@ let compare_builds
         H.li [
           H.a ~a:H.[a_href "#duniverse-packages-version-diff"]
             [txtf "%d duniverse packages with version changes"
-               (List.length duniverse_version_diff)]
+               (List.length duniverse_content_diff)]
         ];
         H.li [
           H.a ~a:H.[a_href "#opam-packages-opam-diff"]
@@ -963,15 +963,15 @@ let compare_builds
       H.h3 ~a:H.[a_id "opam-packages-version-diff"]
         [H.txt "Opam packages with version changes"];
       H.code (package_diffs version_diff);
-      H.h3 ~a:H.[a_id "duniverse-packages-removed"]
-        [H.txt "Duniverse packages removed"];
-      H.code (duniverse_packages duniverse_left);
-      H.h3 ~a:H.[a_id "duniverse-packages-installed"]
-        [H.txt "New Duniverse packages installed"];
-      H.code (duniverse_packages duniverse_right);
-      H.h3 ~a:H.[a_id "duniverse-packages-version-diff"]
-        [H.txt "Duniverse packages with version changes"];
-      H.code (duniverse_diffs duniverse_version_diff);
+      H.h3 ~a:H.[a_id "duniverse-dirs-removed"]
+        [H.txt "Duniverse directories removed"];
+      H.code (duniverse_dirs duniverse_left);
+      H.h3 ~a:H.[a_id "duniverse-dirs-installed"]
+        [H.txt "New Duniverse directories installed"];
+      H.code (duniverse_dirs duniverse_right);
+      H.h3 ~a:H.[a_id "duniverse-dirs-version-diff"]
+        [H.txt "Duniverse directories with content changes"];
+      H.code (duniverse_diffs duniverse_content_diff);
       H.h3 ~a:H.[a_id "opam-packages-opam-diff"]
         [H.txt "Opam packages with changes in their opam file"]] @
       opam_diffs opam_diff @ [
diff --git a/opamdiff/opamdiff.ml b/opamdiff/opamdiff.ml
index 3e5af5c..4230d1e 100644
--- a/opamdiff/opamdiff.ml
+++ b/opamdiff/opamdiff.ml
@@ -79,7 +79,7 @@ let pp_duniverse_diff ppf { name ; urls ; hash } =
     (String.concat ", " (List.map (fun (h, l, r) ->
          OpamHash.string_of_kind h ^ " " ^ opt_hash l ^ "->" ^ opt_hash r) hash))
 
-let pp_duniverse_pkg ppf (dir, url) =
+let pp_duniverse_dir ppf (dir, url) =
   Format.fprintf ppf "%s (%s)" dir url
 
 let duniverse_diff l r =
@@ -105,14 +105,14 @@ let duniverse_diff l r =
         | Some l, Some r -> diff := (key, l, r) :: !diff; None)
       l r
   in
-  let pkg_only keys map =
+  let dir_only keys map =
     let only =
       M.filter (fun k _ -> List.mem k keys) map |> M.bindings
     in
     List.map (fun (key, (url, _)) -> key, url) only
   in
-  let l_only = pkg_only !keys_l_only l
-  and r_only = pkg_only !keys_r_only r
+  let l_only = dir_only !keys_l_only l
+  and r_only = dir_only !keys_r_only r
   and diff =
     List.map (fun (name, (url_l, hashes_l), (url_r, hashes_r)) ->
         let urls =