Dont run any tasks recursively from another task

The only time a task may run recursively is after a new project has been pushed to the stack.

Author: ericmj

lib/mix/lib/mix/server.ex

@@ -5,10 +5,9 @@ defmodule Mix.Server do
   use GenServer.Behaviour
 
   defrecord Config, tasks: Ordset.new, projects: [], mixfile: [],
-    shell: Mix.Shell.IO, scm: Ordset.new, env: nil, post_config: [],
-    io_done: false
+    shell: Mix.Shell.IO, scm: Ordset.new, env: nil, post_config: []
 
-  defrecord Project, name: nil, config: nil
+  defrecord Project, name: nil, config: nil, rec_enabled?: true, io_done: false
 
   def start_link(env) do
     :gen_server.start_link({ :local, __MODULE__ }, __MODULE__, env, [])
@@ -59,7 +58,7 @@ defmodule Mix.Server do
   def handle_call(:pop_project, _from, config) do
     case config.projects do
       [ Project[name: project] | tail ] ->
-        { :reply, project, config.projects(tail).io_done(false) }
+        { :reply, project, config.projects(tail) }
       _ ->
         { :reply, nil, config }
     end
@@ -69,15 +68,25 @@ defmodule Mix.Server do
     { :reply, config.mixfile[app], config }
   end
 
-  def handle_call(:io_done, _from, config) do
-    { :reply, config.io_done, config.io_done(true) }
-  end
-
   def handle_call(:output_app?, _from, config) do
     # Check that we haven't already outputted app and that we are part of an
     # umbrella project
-    output = not config.io_done and not umbrella?(config) and in_umbrella?(config)
-    { :reply, output, config.io_done(true) }
+    case config.projects do
+      [ project | tail ] ->
+        output = not project.io_done and not umbrella?(config) and in_umbrella?(config)
+        { :reply, output, config.projects([project.io_done(true)|tail]) }
+      _ ->
+        { :reply, false, config }
+    end
+  end
+
+  def handle_call(:recursive_enabled?, _from, config) do
+    case config.projects do
+      [ Project[rec_enabled?: bool] | _ ] ->
+        { :reply, bool, config }
+      _ ->
+        { :reply, true, config }
+    end
   end
 
   def handle_call(request, from, config) do
@@ -113,7 +122,6 @@ defmodule Mix.Server do
     project = Project[name: name, config: conf]
     config = config.post_config([])
                    .update_projects([project|&1])
-                   .io_done(false)
     { :noreply, config }
   end
 
@@ -133,18 +141,27 @@ defmodule Mix.Server do
     { :noreply, config.mixfile([]) }
   end
 
+  def handle_cast({:recursive_enabled?, bool}, config) do
+    case config.projects do
+      [ project | tail ] ->
+        { :noreply, config.projects([project.rec_enabled?(bool)|tail]) }
+      _ ->
+        { :noreply, config }
+    end
+  end
+
   def handle_cast(request, config) do
     super(request, config)
   end
 
-  # Returns if project is part of an umbrella project
+  # Returns true if project is part of an umbrella project
   defp in_umbrella?(config) do
     Enum.any?(config.projects, fn(Project[config: conf]) ->
       conf[:apps_path] != nil
     end)
   end
 
-  # Returns if project is an umbrella project
+  # Returns true if project is an umbrella project
   defp umbrella?(config) do
     case config.projects do
       [ Project[name: name, config: config] | _ ] when name != nil ->

lib/mix/lib/mix/task.ex

@@ -141,13 +141,16 @@ defmodule Mix.Task do
 
       recursive = recursive(module)
 
-      if recursive do
+      if recursive && Mix.Server.call(:recursive_enabled?) do
+        Mix.Server.cast({ :recursive_enabled?, false })
         res = if Mix.Project.umbrella? and recursive == :both do
           [module.run(args)]
         else
           []
         end
-        res ++ Mix.Project.recur(fn _ -> module.run(args) end)
+        res = res ++ Mix.Project.recur(fn _ -> module.run(args) end)
+        Mix.Server.cast({ :recursive_enabled?, true })
+        res
       else
         module.run(args)
       end