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

master_changes.md

@@ -43,6 +43,7 @@ users)
 
 ## Tree
   * Fix opam tree --test --doc assigning the with-{test,doc} variables to unrequested packages [#5919 @kit-ty-kate - fix #5755]
+  * Fix combinations of opam tree --{tree,doc} and --no-switch [#5919 @kit-ty-kate - fix #5920]
 
 ## Exec
 

src/client/opamTreeCommand.ml

@@ -416,7 +416,13 @@ let run st tog ?no_constraint mode filter atoms =
       (OpamPackage.Set.empty, []) atoms
   in
   let st, universe =
-    let universe = get_universe tog select st in
+    let universe =
+      let requested =
+        OpamFormula.packages_of_atoms
+          (if missing = [] then st.installed else st.packages) atoms
+      in
+      get_universe tog requested st
+    in
     match mode, filter, missing with
     | Deps, _, [] -> st, universe
     | Deps, Roots_from, _::_ ->

tests/reftests/tree.test

@@ -367,12 +367,14 @@ h.1
     '-- b.1 (>= 1 & < 3) [*]
 ### opam tree j --with-test
 The following actions are simulated:
-=== install 2 packages
+=== install 3 packages
   - install a 1 [required by j]
   - install j 1
+  - install k 1 [required by j]
 
 j.1
-'-- a.1
+|-- a.1
+'-- k.1 (with-test)
 ### opam tree e
 The following actions are simulated:
 === install 3 packages
@@ -488,13 +490,15 @@ e.1
 '-- a.1
 ### opam tree e --with-test --no-switch
 The following actions are simulated:
-=== install 3 packages
+=== install 4 packages
   - install a 1 [required by e]
   - install b 1
+  - install d 1 [required by e]
   - install e 1
 
 e.1
-'-- a.1
+|-- a.1
+'-- d.1 (< 2 & with-test)
 ### : invariant
 ### <pkg:h.1>
 opam-version: "2.0"