Merge pull request #2197 from ericmj/remote-converger-filter

Don't load dependencies in remote converger

Author: ericmj

lib/mix/lib/mix/cli.ex

@@ -26,7 +26,7 @@ defmodule Mix.CLI do
     run_task(task, args)
   end
 
-  @hex_requirement ">= 0.1.0-dev"
+  @hex_requirement ">= 0.1.1-dev"
 
   defp load_remote do
     if Code.ensure_loaded?(Hex) do

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

@@ -76,8 +76,8 @@ defmodule Mix.Dep.Converger do
              |> Enum.into(HashDict.new, &{&1.app, &1})
 
       # In case there is no lock, we will read the current lock
-      # which is potentially stale. So converger.deps needs to
-      # always check if the data it finds on the lock is actually
+      # which is potentially stale. So converger.deps/2 needs to
+      # always check if the data it finds in the lock is actually
       # valid.
       lock_for_converger = lock || Mix.Dep.Lock.read
 
@@ -148,7 +148,8 @@ 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.
-              Mix.Dep.Loader.load(dep, children)
+              dep = Mix.Dep.Loader.load(dep)
+              %{dep | deps: Enum.filter(dep.deps, &(!children || &1.app in children))}
           end
 
         dep = %{dep | deps: reject_non_fullfilled_optional(dep.deps, current_breadths)}

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

@@ -36,33 +36,33 @@ defmodule Mix.Dep.Loader do
   Loads the given dependency information, including its
   latest status and children.
   """
-  def load(dep, children) do
+  def load(dep) do
     %Mix.Dep{manager: manager, scm: scm, opts: opts} = dep
     dep  = %{dep | status: scm_status(scm, opts)}
     dest = opts[:dest]
 
     {dep, children} =
       cond do
         not ok?(dep.status) ->
-          {dep, children}
+          {dep, []}
 
         manager == :rebar ->
-          rebar_dep(dep, children)
+          rebar_dep(dep)
 
         mix?(dest) ->
-          mix_dep(%{dep | manager: :mix}, children)
+          mix_dep(%{dep | manager: :mix})
 
         rebar?(dest) ->
-          rebar_dep(%{dep | manager: :rebar}, children)
+          rebar_dep(%{dep | manager: :rebar})
 
         make?(dest) ->
-          {%{dep | manager: :make}, children}
+          {%{dep | manager: :make}, []}
 
         true ->
-          {dep, children}
+          {dep, []}
       end
 
-    %{validate_path(validate_app(dep)) | deps: children || []}
+    %{validate_path(validate_app(dep)) | deps: children}
   end
 
   @doc """
@@ -205,7 +205,7 @@ defmodule Mix.Dep.Loader do
 
   ## Fetching
 
-  defp mix_dep(%Mix.Dep{opts: opts} = dep, children) do
+  defp mix_dep(%Mix.Dep{opts: opts} = dep) do
     Mix.Dep.in_dependency(dep, fn _ ->
       config    = Mix.project
       umbrella? = Mix.Project.umbrella?
@@ -220,16 +220,16 @@ defmodule Mix.Dep.Loader do
       end
 
       dep = %{dep | manager: :mix, opts: opts, extra: [umbrella: umbrella?]}
-      {dep, children || children(env: opts[:env] || :prod)}
+      {dep, children(env: opts[:env] || :prod)}
     end)
   end
 
-  defp rebar_dep(%Mix.Dep{} = dep, children) do
+  defp rebar_dep(%Mix.Dep{} = dep) 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, children || rebar_children(rebar)}
+      {dep, rebar_children(rebar)}
     end)
   end
 

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, nil)
+      umbrella_dep = Mix.Dep.Loader.load(umbrella_dep)
       deps = Enum.filter(umbrella_dep.deps, fn dep ->
         Mix.Dep.available?(dep) and dep.app in apps
       end)

lib/mix/lib/mix/remote_converger.ex

@@ -20,11 +20,10 @@ defmodule Mix.RemoteConverger do
   defcallback converge([Mix.Dep.t], map) :: map
 
   @doc """
-  Returns a loaded list of child dependencies the converger has
-  for the dependency. This list should override what is specified
-  in mix.exs or rebar.config.
+  Returns a child dependencies the converger has  for the
+  dependency. This list should filter the loaded children.
   """
-  defcallback deps(Mix.Dep.t, map) :: [Mix.Dep.t]
+  defcallback deps(Mix.Dep.t, map) :: [atom]
 
 
   @doc """