Store only app names in Mix.Dep.deps

Author: José Valim

lib/mix/lib/mix/deps.ex

@@ -9,7 +9,7 @@ defrecord Mix.Dep, [ scm: nil, app: nil, requirement: nil, status: nil, opts: ni
   * `requirement` - a binary or regex with the dependency's requirement
   * `status` - the current status of the dependency, check `Mix.Deps.format_status/1` for more info;
   * `opts` - the options given by the developer
-  * `deps` - dependencies of this dependency
+  * `deps` - the app names of the dependencies of this dependency
   * `manager` - the project management, possible values: `:rebar` | `:mix` | `:make` | `nil`
   * `from` - path to the file where the dependency was defined
   * `extra` - a slot for adding extra configuration based on the scm.
@@ -437,7 +437,7 @@ defmodule Mix.Deps do
     dep_names = Enum.map(deps, fn dep -> dep.app end)
 
     parents = Enum.filter all_deps, fn dep ->
-      Enum.any?(dep.deps, fn child_dep -> child_dep.app in dep_names end)
+      Enum.any?(dep.deps, &(&1 in dep_names))
     end
 
     do_with_depending(parents, all_deps) ++ parents

lib/mix/lib/mix/deps/converger.ex

@@ -22,8 +22,8 @@ defmodule Mix.Deps.Converger do
         :digraph.add_vertex(graph, app)
       end
 
-      Enum.each deps, fn Mix.Dep[app: app, deps: deps] ->
-        Enum.each deps, fn Mix.Dep[app: other_app] ->
+      Enum.each deps, fn Mix.Dep[app: app, deps: other_apps] ->
+        Enum.each other_apps, fn other_app ->
           :digraph.add_edge(graph, other_app, app)
         end
       end
@@ -104,9 +104,9 @@ defmodule Mix.Deps.Converger do
         # After we invoke the callback (which may actually check out the
         # dependency), we fetch the dependency including its latest info
         # and children information.
-        dep = Mix.Deps.Retriever.fetch(dep, config)
+        { dep, children } = Mix.Deps.Retriever.fetch(dep, config)
         { acc, rest } = all(t, [dep|acc], upper_breadths, current_breadths, config, callback, rest)
-        all(dep.deps, acc, current_breadths, dep.deps ++ current_breadths, config, callback, rest)
+        all(children, acc, current_breadths, children ++ current_breadths, config, callback, rest)
     end
   end
 

lib/mix/lib/mix/deps/retriever.ex

@@ -25,25 +25,29 @@ defmodule Mix.Deps.Retriever do
     dep  = dep.status(scm_status(scm, opts))
     dest = opts[:dest]
 
-    validate_app(cond do
-      not ok?(dep.status) ->
-        dep
+    { dep, children } =
+      cond do
+        not ok?(dep.status) ->
+          { dep, [] }
 
-      manager == :rebar ->
-        rebar_dep(dep, config)
+        manager == :rebar ->
+          rebar_dep(dep, config)
 
-      mix?(dest) ->
-        mix_dep(dep.manager(:mix), config)
+        mix?(dest) ->
+          mix_dep(dep.manager(:mix), config)
 
-      rebar?(dest) ->
-        rebar_dep(dep.manager(:rebar), config)
+        rebar?(dest) ->
+          rebar_dep(dep.manager(:rebar), config)
 
-      make?(dest) ->
-        dep.manager(:make)
+        make?(dest) ->
+          { dep.manager(:make), [] }
 
-      true ->
-        mix_dep(dep.manager(:mix), config)
-    end)
+        true ->
+          mix_dep(dep.manager(:mix), config)
+      end
+
+    dep = dep.deps(Enum.map(children, &(&1.app)))
+    { validate_app(dep), children }
   end
 
   @doc """
@@ -150,15 +154,15 @@ defmodule Mix.Deps.Retriever do
         true -> status
       end
 
-      dep.manager(:mix).opts(opts).deps(children).status(stat)
+      { dep.manager(:mix).opts(opts).status(stat), children }
     end)
   end
 
   defp rebar_dep(Mix.Dep[opts: opts] = dep, _config) do
     File.cd!(opts[:dest], fn ->
       config = Mix.Rebar.load_config(".")
       extra  = Dict.take(config, [:sub_dirs])
-      dep.manager(:rebar).extra(extra).deps(rebar_children(config))
+      { dep.manager(:rebar).extra(extra), rebar_children(config) }
     end)
   end
 

lib/mix/lib/mix/deps/umbrella.ex

@@ -28,14 +28,15 @@ defmodule Mix.Deps.Umbrella do
     apps = Enum.map(deps, &(&1.app))
 
     Enum.map(deps, fn(umbrella_dep) ->
-      umbrella_dep = Mix.Deps.Retriever.fetch(umbrella_dep, [])
-      umbrella_dep.update_deps(&Enum.filter(&1, fn dep ->
-        Mix.Deps.available?(dep) and dep.app in apps
-      end))
+      { umbrella_dep, deps } = Mix.Deps.Retriever.fetch(umbrella_dep, [])
+      deps = lc Mix.Dep[] = dep inlist deps,
+                Mix.Deps.available?(dep),
+                dep.app in apps,
+                do: dep.app
+      umbrella_dep.deps(deps)
     end) |> Mix.Deps.Converger.topsort
   end
 
-
   defp extract_umbrella(paths) do
     lc path inlist paths do
       app = path |> Path.basename |> String.downcase |> binary_to_atom