Merge branch 'master' into split-desprecated-files-from-2.0-fields

Author: kit-ty-kate

master_changes.md

@@ -32,6 +32,7 @@ users)
 ## Remove
 
 ## UI
+  * Read full lines when asking for user input when `TERM=dumb` [#6829 @arvidj - fix #6828]
 
 ## Switch
 
@@ -42,6 +43,7 @@ users)
 ## List
 
 ## Show
+  * Improve performance of `opam show` by reading switch selection only once instead of once per package-version [#6818 @dra27]
 
 ## Var/Option
 
@@ -157,6 +159,8 @@ users)
 
 ## opam-state
   * `OpamRepositoryState.load_opams_from_diff` track added packages to avoid removing version-equivalent packages [#6774 @arozovyk fix #6754]
+  * `OpamGlobalState.all_installed_versions`: was added [#6818 @dra27]
+  * `OpamGlobalState.installed_versions`: was removed [#6818 @dra27]
 
 ## opam-solver
 
@@ -173,3 +177,4 @@ users)
   * `OpamCompat.Int.min`: was added [#6515 @kit-ty-kate]
   * `OpamStd.String.compare_case`: is now allocation free [#6515 @dra27]
   * `OpamVersionCompare.{compare,equal}`: are now allocation free [#6515 @dra27]
+  * `OpamCompat.Map.add_to_list`: was added [#6818 @dra27]

src/client/opamListCommand.ml

@@ -511,10 +511,7 @@ let field_of_string ~raw =
     | None -> OpamConsole.error_and_exit `Bad_arguments "No printer for %S" s
 
 (* NOTE: upon changes, please update the man page section in opamCommands.ml *)
-let version_color st nv =
-  let installed = (* (in any switch) *)
-    OpamGlobalState.installed_versions st.switch_global nv.name
-  in
+let version_color installed st nv =
   let is_available nv = (* Ignore unavailability due to pinning *)
     try
       OpamFilter.eval_to_bool ~default:false
@@ -545,7 +542,8 @@ let mini_field_printer ?(prettify=false) ?(normalise=false) =
   | List l -> OpamPrinter.value_list l
   | _ -> OpamPrinter.Normalise.value v
 
-let detail_printer ?prettify ?normalise ?(sort=false) st nv =
+let detail_printer ?prettify ?normalise ?(sort=false) installed st nv =
+  let version_color = version_color installed in
   let open OpamStd.Option.Op in
   let (%) s cols = OpamConsole.colorise' cols s in
   let root_sty =
@@ -643,12 +641,14 @@ let detail_printer ?prettify ?normalise ?(sort=false) st nv =
     OpamStd.Option.default "" hash_opt
   | Raw -> OpamFile.OPAM.write_to_string (get_opam st nv)
   | All_installed_versions ->
-    OpamGlobalState.installed_versions st.switch_global nv.name |>
-    OpamPackage.Map.mapi (fun nv switches ->
-        Printf.sprintf "%s [%s]"
-          (OpamPackage.version_to_string nv % version_color st nv)
-          (String.concat " " (List.map OpamSwitch.to_string switches))) |>
-    OpamPackage.Map.values |>
+    let needed = nv.name in
+    OpamPackage.Map.fold (fun nv switches acc ->
+        if OpamPackage.Name.equal needed nv.name then
+          (Printf.sprintf "%s [%s]"
+            (OpamPackage.version_to_string nv % version_color st nv)
+            (String.concat " " (List.map OpamSwitch.to_string switches)))::acc
+        else acc) installed [] |>
+    List.rev |>
     String.concat "  "
   | Available_versions ->
     let available =
@@ -759,8 +759,9 @@ let display st format packages =
        OpamConsole.errmsg "%s\n"
          (OpamConsole.colorise `red "# No matches found"))
   else
+    let installed = OpamGlobalState.all_installed_versions st.switch_global in
     List.rev_map (fun nv ->
-        List.map (detail_printer ~prettify ~normalise st nv) format.columns)
+        List.map (detail_printer ~prettify ~normalise installed st nv) format.columns)
       packages |>
     List.rev |>
     add_head |>
@@ -834,10 +835,11 @@ let info st ~fields ~raw ~where ?normalise ?(show_empty=false)
     Synopsis;
     Description;
   ] in
+  let installed = OpamGlobalState.all_installed_versions st.switch_global in
   let output_table fields nv =
     let tbl =
       List.fold_left (fun acc item ->
-          let contents = detail_printer ?normalise ~sort st nv item in
+          let contents = detail_printer ?normalise ~sort installed st nv item in
           if show_empty || contents <> "" then
             [ OpamConsole.colorise `blue (string_of_field ~raw item); contents ]
             :: acc
@@ -888,7 +890,7 @@ let info st ~fields ~raw ~where ?normalise ?(show_empty=false)
     | [] ->
       OpamConsole.header_msg "Version-specific details";
       output_table one_version_fields pkg
-    | [f] -> OpamConsole.msg "%s\n" (detail_printer ?normalise ~sort st pkg f)
+    | [f] -> OpamConsole.msg "%s\n" (detail_printer ?normalise ~sort installed st pkg f)
     | fields -> output_table fields pkg
   in
   List.iter (fun (name,_) ->

src/core/opamCompat.ml

@@ -238,6 +238,9 @@ module type MAP = sig
 
   (** NOTE: OCaml >= 4.11 *)
   val filter_map: (key -> 'a -> 'b option) -> 'a t -> 'b t
+
+  (** NOTE: OCaml >= 5.1 *)
+  val add_to_list: key -> 'a -> 'a list t -> 'a list t
 end
 
 module Map(Ord : Stdlib.Map.OrderedType) = struct
@@ -253,6 +256,11 @@ module Map(Ord : Stdlib.Map.OrderedType) = struct
         | None -> map
       ) map M.empty
 
+  (** NOTE: OCaml >= 5.1 *)
+  let add_to_list x data m =
+    let add = function None -> Some [data] | Some l -> Some (data :: l) in
+    M.update x add m
+
   include M
 end
 

src/core/opamCompat.mli

@@ -78,6 +78,9 @@ module type MAP = sig
 
   (** NOTE: OCaml >= 4.11 *)
   val filter_map: (key -> 'a -> 'b option) -> 'a t -> 'b t
+
+  (** NOTE: OCaml >= 5.1 *)
+  val add_to_list: key -> 'a -> 'a list t -> 'a list t
 end
 
 module Map(Ord : Stdlib.Map.OrderedType) : MAP with type key = Ord.t

src/core/opamConsole.ml

@@ -716,7 +716,7 @@ let short_user_input ~prompt ?default ?on_eof f =
   let on_eof = OpamStd.Option.Op.(on_eof ++ default) in
   let prompt () = print_string prompt; flush stdout in
   try
-    if OpamStd.Sys.(not tty_out || os () = Win32 || os () = Cygwin) then
+    if OpamStd.Sys.(not tty_out || os () = Win32 || os () = Cygwin || Lazy.force dumb_term) then
       let rec loop () =
         prompt ();
         let input = match String.lowercase_ascii (read_line ()) with

src/state/opamGlobalState.ml

@@ -167,16 +167,10 @@ let all_installed gt =
       OpamPackage.Set.union acc sel.sel_installed)
     gt  OpamPackage.Set.empty
 
-let installed_versions gt name =
+let all_installed_versions gt =
   fold_switches (fun switch sel acc ->
-      let installed =
-        OpamPackage.packages_of_name sel.sel_installed name
-      in
-      try
-        let nv = OpamPackage.Set.choose installed in
-        try OpamPackage.Map.add nv (switch::OpamPackage.Map.find nv acc) acc
-        with Not_found -> OpamPackage.Map.add nv [switch] acc
-      with Not_found -> acc)
+      OpamPackage.Set.fold (fun nv acc ->
+        OpamPackage.Map.add_to_list nv switch acc) sel.sel_installed acc)
     gt OpamPackage.Map.empty
 
 let repos_list gt = OpamFile.Config.repositories gt.config

src/state/opamGlobalState.mli

@@ -37,9 +37,9 @@ val fold_switches:
     local switch with a configuration file pointing to the current root *)
 val switch_exists: 'a global_state -> switch -> bool
 
-(** Returns the map of installed instances of the package name towards the list
-    of switches they are installed in *)
-val installed_versions: 'a global_state -> name -> switch list package_map
+(** Returns the map of all installed packages to the list of switch(es) they're
+    installed in. *)
+val all_installed_versions: 'a global_state -> switch list package_map
 
 (** Default list of repositories to get packages from, ordered by decreasing
     priority. This can be overridden by switch-specific selections, and does not