Fix combinations of opam tree --{tree,doc} and --no-switch

src/client/opamTreeCommand.ml

@@ -386,14 +386,19 @@ let get_universe tog requested st =
 
 let get_installed st atoms =
   let open OpamPackage.Set.Op in
-  List.fold_left (fun (select, missing) atom ->
+  List.fold_left (fun (select, missing, requested) atom ->
       let installed =
         OpamPackage.Set.filter (OpamFormula.check atom) st.installed
       in
       if OpamPackage.Set.is_empty installed then
-        (select, atom :: missing)
-      else (installed ++ select, missing))
-    (OpamPackage.Set.empty, []) atoms
+        let missing_pkgs = OpamPackage.Set.filter (OpamFormula.check atom) st.packages in
+        if OpamPackage.Set.is_empty missing_pkgs then
+          assert false;
+        (select, atom :: missing, requested ++ missing_pkgs)
+      else
+        let select = installed ++ select in
+        (select, missing, requested ++ select))
+    (OpamPackage.Set.empty, [], OpamPackage.Set.empty) atoms
 
 let dry_install tog st universe install =
   match OpamSolver.resolve universe
@@ -403,8 +408,8 @@ let dry_install tog st universe install =
     print_solution st new_st
       (OpamPackage.Name.Set.of_list (List.map fst install))
       solution;
-    let select, missing = get_installed new_st install in
-    if missing <> [] then
+    let select, missing, requested = get_installed new_st install in
+    if missing <> [] || not (Int.equal (OpamPackage.Set.cardinal select) (OpamPackage.Set.cardinal requested)) then
       assert false;
     new_st, get_universe tog select new_st
   | Conflicts cs ->
@@ -417,9 +422,9 @@ let dry_install tog st universe install =
 
 let run st tog ?no_constraint mode filter atoms =
   let open OpamPackage.Set.Op in
-  let select, missing = get_installed st atoms in
+  let select, missing, requested = get_installed st atoms in
   let st, universe =
-    let universe = get_universe tog select st in
+    let universe = get_universe tog requested st in
     match mode, filter, missing with
     | Deps, _, [] -> st, universe
     | Deps, Roots_from, _::_ ->