robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nomenclature: duniverse dirs vs duniverse packages

Browse source 
We have duniverse (simple) directories and no version information.
This commit is contained in:
Reynir Björnsson 2022-11-07 16:34:02 +01:00
parent 8862440053
commit 8caa98644f
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/views.ml
View file

@ -809,11 +809,11 @@ let package_diffs diffs =
]) ])
diffs diffs
let duniverse_packages pkgs = let duniverse_dirs dirs =
List.concat_map (fun p -> [ List.concat_map (fun p -> [
txtf "%a" Opamdiff.pp_duniverse_pkg p; txtf "%a" Opamdiff.pp_duniverse_dir p;
H.br (); H.br ();
]) pkgs ]) dirs
let duniverse_diffs diffs = let duniverse_diffs diffs =
List.concat_map (fun p -> [ List.concat_map (fun p -> [
@ -860,7 +860,7 @@ let compare_builds
~(build_right : Builder_db.Build.t) ~(build_right : Builder_db.Build.t)
~env_diff:(added_env, removed_env, changed_env) ~env_diff:(added_env, removed_env, changed_env)
~pkg_diff:(added_pkgs, removed_pkgs, changed_pkgs) ~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 layout
~nav:(`Comparison ((job_left, build_left), (job_right, build_right))) ~nav:(`Comparison ((job_left, build_left), (job_right, build_right)))
@ -922,7 +922,7 @@ let compare_builds
H.li [ H.li [
H.a ~a:H.[a_href "#duniverse-packages-version-diff"] H.a ~a:H.[a_href "#duniverse-packages-version-diff"]
[txtf "%d duniverse packages with version changes" [txtf "%d duniverse packages with version changes"
(List.length duniverse_version_diff)] (List.length duniverse_content_diff)]
]; ];
H.li [ H.li [
H.a ~a:H.[a_href "#opam-packages-opam-diff"] 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.h3 ~a:H.[a_id "opam-packages-version-diff"]
[H.txt "Opam packages with version changes"]; [H.txt "Opam packages with version changes"];
H.code (package_diffs version_diff); H.code (package_diffs version_diff);
H.h3 ~a:H.[a_id "duniverse-packages-removed"] H.h3 ~a:H.[a_id "duniverse-dirs-removed"]
[H.txt "Duniverse packages removed"]; [H.txt "Duniverse directories removed"];
H.code (duniverse_packages duniverse_left); H.code (duniverse_dirs duniverse_left);
H.h3 ~a:H.[a_id "duniverse-packages-installed"] H.h3 ~a:H.[a_id "duniverse-dirs-installed"]
[H.txt "New Duniverse packages installed"]; [H.txt "New Duniverse directories installed"];
H.code (duniverse_packages duniverse_right); H.code (duniverse_dirs duniverse_right);
H.h3 ~a:H.[a_id "duniverse-packages-version-diff"] H.h3 ~a:H.[a_id "duniverse-dirs-version-diff"]
[H.txt "Duniverse packages with version changes"]; [H.txt "Duniverse directories with content changes"];
H.code (duniverse_diffs duniverse_version_diff); H.code (duniverse_diffs duniverse_content_diff);
H.h3 ~a:H.[a_id "opam-packages-opam-diff"] H.h3 ~a:H.[a_id "opam-packages-opam-diff"]
[H.txt "Opam packages with changes in their opam file"]] @ [H.txt "Opam packages with changes in their opam file"]] @
opam_diffs opam_diff @ [ opam_diffs opam_diff @ [

8
opamdiff/opamdiff.ml
View file

@ -79,7 +79,7 @@ let pp_duniverse_diff ppf { name ; urls ; hash } =
(String.concat ", " (List.map (fun (h, l, r) -> (String.concat ", " (List.map (fun (h, l, r) ->
OpamHash.string_of_kind h ^ " " ^ opt_hash l ^ "->" ^ opt_hash r) hash)) 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 Format.fprintf ppf "%s (%s)" dir url
let duniverse_diff l r = let duniverse_diff l r =
@ -105,14 +105,14 @@ let duniverse_diff l r =
| Some l, Some r -> diff := (key, l, r) :: !diff; None) | Some l, Some r -> diff := (key, l, r) :: !diff; None)
l r l r
in in
let pkg_only keys map = let dir_only keys map =
let only = let only =
M.filter (fun k _ -> List.mem k keys) map |> M.bindings M.filter (fun k _ -> List.mem k keys) map |> M.bindings
in in
List.map (fun (key, (url, _)) -> key, url) only List.map (fun (key, (url, _)) -> key, url) only
in in
let l_only = pkg_only !keys_l_only l let l_only = dir_only !keys_l_only l
and r_only = pkg_only !keys_r_only r and r_only = dir_only !keys_r_only r
and diff = and diff =
List.map (fun (name, (url_l, hashes_l), (url_r, hashes_r)) -> List.map (fun (name, (url_l, hashes_l), (url_r, hashes_r)) ->
let urls = let urls =