Move children decision down the tree so we don't ignore umbrella children

Author: José Valim

lib/mix/lib/mix/dep/converger.ex

@@ -156,8 +156,7 @@ defmodule Mix.Dep.Converger do
               # After we invoke the callback (which may actually check out the
               # dependency), we load the dependency including its latest info
               # and children information.
-              dep = Mix.Dep.Loader.load(dep)
-              %{dep | deps: Enum.filter(dep.deps, &(!children || &1.app in children))}
+              Mix.Dep.Loader.load(dep, children)
           end
 
         dep = %{dep | deps: reject_non_fullfilled_optional(dep.deps, current_breadths)}

lib/mix/lib/mix/dep/loader.ex

@@ -17,26 +17,14 @@ defmodule Mix.Dep.Loader do
     * `:env` - filter dependencies on given environments
   """
   def children(opts) do
-    from = Path.absname("mix.exs")
-    deps = Enum.map(Mix.Project.config[:deps] || [], &to_dep(&1, from))
-
-    # Filter deps not matching mix environment
-    if env = opts[:env] do
-      deps =
-        Enum.filter(deps, fn %Mix.Dep{opts: opts} ->
-          only = opts[:only]
-          if only, do: env in List.wrap(only), else: true
-        end)
-    end
-
-    deps ++ Mix.Dep.Umbrella.unloaded
+    mix_children(opts) ++ Mix.Dep.Umbrella.unloaded
   end
 
   @doc """
   Loads the given dependency information, including its
   latest status and children.
   """
-  def load(dep) do
+  def load(dep, children) do
     %Mix.Dep{manager: manager, scm: scm, opts: opts} = dep
     dep  = %{dep | status: scm_status(scm, opts)}
     dest = opts[:dest]
@@ -47,16 +35,16 @@ defmodule Mix.Dep.Loader do
           {dep, []}
 
         manager == :rebar ->
-          rebar_dep(dep)
+          rebar_dep(dep, children)
 
         mix?(dest) ->
-          mix_dep(%{dep | manager: :mix})
+          mix_dep(dep, children)
 
         rebar?(dest) ->
-          rebar_dep(%{dep | manager: :rebar})
+          rebar_dep(dep, children)
 
         make?(dest) ->
-          {%{dep | manager: :make}, []}
+          make_dep(dep)
 
         true ->
           {dep, []}
@@ -200,35 +188,60 @@ defmodule Mix.Dep.Loader do
 
   ## Fetching
 
-  defp mix_dep(%Mix.Dep{opts: opts} = dep) do
+  defp mix_dep(%Mix.Dep{opts: opts} = dep, children) do
     Mix.Dep.in_dependency(dep, fn _ ->
       umbrella? = Mix.Project.umbrella?
 
       if umbrella? do
         opts = Keyword.put_new(opts, :app, false)
       end
 
+      children = (mix_children(env: opts[:env] || :prod) |> filter_children(children))
+                 ++ Mix.Dep.Umbrella.unloaded
+
       dep = %{dep | manager: :mix, opts: opts, extra: [umbrella: umbrella?]}
-      {dep, children(env: opts[:env] || :prod)}
+      {dep, children}
     end)
   end
 
-  defp rebar_dep(%Mix.Dep{} = dep) do
+  defp rebar_dep(%Mix.Dep{} = dep, children) do
     Mix.Dep.in_dependency(dep, fn _ ->
       rebar = Mix.Rebar.load_config(".")
       extra = Dict.take(rebar, [:sub_dirs])
       dep   = %{dep | manager: :rebar, extra: extra}
-      {dep, rebar_children(rebar)}
+      {dep, rebar |> rebar_children |> filter_children(children)}
     end)
   end
 
+  defp make_dep(dep) do
+    {%{dep | manager: :make}, []}
+  end
+
+  defp mix_children(opts) do
+    from = Path.absname("mix.exs")
+    deps = Enum.map(Mix.Project.config[:deps] || [], &to_dep(&1, from))
+
+    # Filter deps not matching mix environment
+    if env = opts[:env] do
+      Enum.filter(deps, fn %Mix.Dep{opts: opts} ->
+        only = opts[:only]
+        if only, do: env in List.wrap(only), else: true
+      end)
+    else
+      deps
+    end
+  end
+
   defp rebar_children(root_config) do
     from = Path.absname("rebar.config")
     Mix.Rebar.recur(root_config, fn config ->
       Mix.Rebar.deps(config) |> Enum.map(&to_dep(&1, from, :rebar))
     end) |> Enum.concat
   end
 
+  defp filter_children(deps, nil), do: deps
+  defp filter_children(deps, children), do: Enum.filter(deps, &(&1.app in children))
+
   defp validate_path(%Mix.Dep{scm: scm, manager: manager} = dep) do
     if scm == Mix.SCM.Path and not manager in [:mix, nil] do
       Mix.raise ":path option can only be used with mix projects, " <>

lib/mix/lib/mix/dep/umbrella.ex

@@ -29,7 +29,7 @@ defmodule Mix.Dep.Umbrella do
     apps = Enum.map(deps, &(&1.app))
 
     Enum.map(deps, fn umbrella_dep ->
-      umbrella_dep = Mix.Dep.Loader.load(umbrella_dep)
+      umbrella_dep = Mix.Dep.Loader.load(umbrella_dep, nil)
       deps = Enum.filter(umbrella_dep.deps, fn dep ->
         Mix.Dep.available?(dep) and dep.app in apps
       end)