Ensure mix deps.compile --include-children recurs on root dep

Author: José Valim

lib/mix/lib/mix/dep.ex

@@ -100,10 +100,12 @@ defmodule Mix.Dep do
 
     # Ensure all apps are atoms
     apps = to_app_names(given)
-
-    # We need to keep the order of deps, loaded/1 properly orders them
-    deps = Enum.filter(all_deps, &(&1.app in apps))
-    deps = if opts[:include_children], do: include_children(deps, all_deps), else: deps
+    deps =
+      if opts[:include_children] do
+        get_deps_with_children(all_deps, apps)
+      else
+        get_deps(all_deps, apps)
+      end
 
     Enum.each apps, fn(app) ->
       unless Enum.any?(all_deps, &(&1.app == app)) do
@@ -114,17 +116,29 @@ defmodule Mix.Dep do
     deps
   end
 
-  # If we need to include children, we need to traverse all
-  # them, fetch the uniq app names, and once again filter all
-  # deps to keep the proper dependency ordering.
-  defp include_children(deps, all_deps) do
-    deps = include_children(deps)
-    apps = deps |> Enum.map(& &1.app) |> Enum.uniq
+  defp get_deps(all_deps, apps) do
     Enum.filter(all_deps, &(&1.app in apps))
   end
 
-  defp include_children([]), do: []
-  defp include_children(deps), do: deps ++ include_children(Enum.flat_map(deps, & &1.deps))
+  defp get_deps_with_children(all_deps, apps) do
+    deps = get_children(all_deps, apps)
+    apps = deps |> Enum.map(& &1.app) |> Enum.uniq
+    get_deps(all_deps, apps)
+  end
+
+  defp get_children(_all_deps, []), do: []
+  defp get_children(all_deps, apps) do
+    # Current deps
+    deps = get_deps(all_deps, apps)
+
+    # Children apps
+    apps = for %{deps: children} <- deps,
+               %{app: app} <- children,
+               do: app
+
+    # Current deps + children deps
+    deps ++ get_children(all_deps, apps)
+  end
 
   @doc """
   Runs the given `fun` inside the given dependency project by

lib/mix/test/mix/tasks/deps.git_test.exs

@@ -133,6 +133,23 @@ defmodule Mix.Tasks.DepsGitTest do
     purge [GitRepo, GitRepo.Mixfile]
   end
 
+  test "compiles many levels deep dependencies" do
+    Mix.Project.push DepsOnGitApp
+
+    in_fixture "no_mixfile", fn ->
+      Mix.Tasks.Deps.Get.run []
+      refute File.exists?("_build/dev/lib/deps_on_git_repo")
+      refute File.exists?("_build/dev/lib/git_repo")
+
+      # Compile the parent with children
+      Mix.Tasks.Deps.Compile.run ["deps_on_git_repo", "--include-children"]
+      assert File.exists?("_build/dev/lib/deps_on_git_repo")
+      assert File.exists?("_build/dev/lib/git_repo")
+    end
+  after
+    purge [GitRepo, GitRepo.Mixfile]
+  end
+
   test "recompiles the project when a dep is fetched" do
     Mix.Project.push GitApp