Consistant naming of dependencies / reverse-dependencies

src/client/opamClient.ml

@@ -546,10 +546,10 @@ let upgrade names =
     let universe = OpamState.universe t Depends in
     let partial_reinstall =
       OpamPackage.Set.of_list
-        (OpamSolver.forward_dependencies ~depopts:true ~installed:true universe partial_reinstall) in
+        (OpamSolver.reverse_dependencies ~depopts:false ~installed:true universe partial_reinstall) in
     let installed_roots = OpamPackage.Set.diff t.installed_roots partial_reinstall in
     let solution = OpamSolution.resolve_and_apply t (Upgrade partial_reinstall)
-      { wish_install = OpamSolution.atoms_of_packages installed_roots;
+      { wish_install = OpamSolution.eq_atoms_of_packages installed_roots;
         wish_remove  = [];
         wish_upgrade = OpamSolution.atoms_of_packages partial_reinstall } in
     solution_found := solution;
@@ -806,11 +806,11 @@ let remove names =
     let universe = OpamState.universe t Depends in
     let to_remove =
       OpamPackage.Set.of_list
-        (OpamSolver.forward_dependencies ~depopts:false ~installed:true universe packages) in
+        (OpamSolver.reverse_dependencies ~depopts:false ~installed:true universe packages) in
     let installed_roots = OpamPackage.Set.diff t.installed_roots to_remove in
     let installed =
       OpamPackage.Set.of_list
-        (OpamSolver.backward_dependencies ~depopts:true ~installed:true universe installed_roots) in
+        (OpamSolver.dependencies ~depopts:true ~installed:true universe installed_roots) in
     let solution = OpamSolution.resolve_and_apply t Remove
       { wish_install = OpamSolution.eq_atoms_of_packages installed;
         wish_remove  = OpamSolution.atoms_of_packages to_remove;
@@ -852,7 +852,7 @@ let reinstall names =
   let reinstall = OpamPackage.Set.of_list reinstall in
   let depends =
     let universe = OpamState.universe t Depends in
-    OpamSolver.forward_dependencies ~depopts:true ~installed:true universe reinstall in
+    OpamSolver.reverse_dependencies ~depopts:true ~installed:true universe reinstall in
   let to_process =
     List.map (fun pkg -> To_recompile pkg) (List.rev depends) in
   let solution = OpamSolution.apply_solution t Reinstall (OpamSolver.sequential_solution to_process) in

src/client/opamConfigCommand.ml

@@ -106,7 +106,7 @@ let get_transitive_dependencies t ?(depopts = false) names =
   let universe = OpamState.universe t Depends in
   (* Compute the transitive closure of dependencies *)
   let packages = OpamPackage.Set.of_list (List.map (OpamState.find_installed_package_by_name t) names) in
-  OpamSolver.backward_dependencies ~depopts universe packages
+  OpamSolver.dependencies ~depopts universe packages
 
 let includes ~is_rec names =
   log "config-includes";

src/solver/opamCudf.ml

@@ -102,9 +102,9 @@ let filter_dependencies f_direction universe packages =
   let packages = Set.of_list packages in
   Graph.closure graph packages
 
-let backward_dependencies = filter_dependencies (fun x -> x)
+let dependencies = filter_dependencies (fun x -> x)
 
-let forward_dependencies = filter_dependencies Graph.mirror
+let reverse_dependencies = filter_dependencies Graph.mirror
 
 let string_of_atom (p, c) =
   let const = function

src/solver/opamCudf.mli

@@ -59,11 +59,11 @@ module ActionGraph: ACTION_GRAPH with type package = Cudf.package
 
 (** Return the transitive closure of dependencies of [set],
     sorted in topological order *)
-val backward_dependencies: Cudf.universe -> Cudf.package list -> Cudf.package list
+val dependencies: Cudf.universe -> Cudf.package list -> Cudf.package list
 
 (** Return the transitive closure of dependencies of [set],
     sorted in topological order *)
-val forward_dependencies: Cudf.universe -> Cudf.package list -> Cudf.package list
+val reverse_dependencies: Cudf.universe -> Cudf.package list -> Cudf.package list
 
 (** Compute the final universe state. *)
 val get_final_universe:

src/solver/opamSolver.ml

@@ -216,9 +216,9 @@ let filter_dependencies f_direction ~depopts ~installed universe packages =
     (OpamMisc.string_of_list OpamPackage.to_string result);
   result
 
-let backward_dependencies = filter_dependencies OpamCudf.backward_dependencies
+let dependencies = filter_dependencies OpamCudf.dependencies
 
-let forward_dependencies = filter_dependencies OpamCudf.forward_dependencies
+let reverse_dependencies = filter_dependencies OpamCudf.reverse_dependencies
 
 let delete_or_update t =
   t.PackageActionGraph.to_remove <> [] ||

src/solver/opamSolver.mli

@@ -50,15 +50,15 @@ val resolve :
 
 (** Return the topological sort of the transitive dependency closures
     of a collection of packages.*)
-val backward_dependencies :
+val dependencies :
   depopts:bool ->
   installed:bool ->
   universe ->
   package_set ->
   package list
 
-(** Same as [backward_dependencies] but for forward dependencies *)
-val forward_dependencies :
+(** Same as [bdependencies] but for reverse dependencies *)
+val reverse_dependencies :
   depopts:bool ->
   installed:bool ->
   universe ->