Do not tag mix exceptions if in root project

Author: José Valim

lib/mix/lib/mix.ex

@@ -95,7 +95,7 @@ defmodule Mix do
 
   defp mix_info do
     case Mix.ProjectStack.peek do
-      {name, config, _file} ->
+      %{name: name, config: config, pos: pos} when pos > 0 ->
         if app = config[:app] do
           {:app, app}
         else

lib/mix/lib/mix/cli.ex

@@ -104,8 +104,8 @@ defmodule Mix.CLI do
        (env = Mix.Project.config[:preferred_cli_env][task]) do
       Mix.env(env)
       if project = Mix.Project.pop do
-        {project, _config, file} = project
-        Mix.Project.push project, file
+        %{name: name, file: file} = project
+        Mix.Project.push name, file
       end
     end
   end

lib/mix/lib/mix/project.ex

@@ -87,7 +87,7 @@ defmodule Mix.Project do
   """
   def get do
     case Mix.ProjectStack.peek do
-      {name, _config, _file} -> name
+      %{name: name} -> name
       _ -> nil
     end
   end
@@ -122,7 +122,7 @@ defmodule Mix.Project do
   """
   def config do
     case Mix.ProjectStack.peek do
-      {_name, config, _file} -> config
+      %{config: config} -> config
       _ -> default_config
     end
   end
@@ -139,12 +139,13 @@ defmodule Mix.Project do
   def config_files do
     [Mix.Dep.Lock.manifest] ++
       case Mix.ProjectStack.peek do
-        {_name, config, file} ->
-          configs = (config[:config_path] || "config/config.exs")
-                    |> Path.dirname
-                    |> Path.join("*.*")
-                    |> Path.wildcard
-                    |> Enum.reject(&String.starts_with?(Path.basename(&1), "."))
+        %{config: config, file: file} ->
+          configs =
+            (config[:config_path] || "config/config.exs")
+            |> Path.dirname
+            |> Path.join("*.*")
+            |> Path.wildcard
+            |> Enum.reject(&String.starts_with?(Path.basename(&1), "."))
           [file|configs]
         _ ->
           []

lib/mix/lib/mix/project_stack.ex

@@ -23,7 +23,7 @@ defmodule Mix.ProjectStack do
       io_done? = stack == []
 
       config  = Keyword.merge(config, state.post_config)
-      project = %{name: module, config: config, file: file,
+      project = %{name: module, config: config, file: file, pos: length(stack),
                   recursing?: false, io_done: io_done?, tasks: HashSet.new}
 
       cond do
@@ -39,7 +39,7 @@ defmodule Mix.ProjectStack do
   def pop do
     get_and_update fn %{stack: stack} = state ->
       case stack do
-        [h|t] -> {project_to_tuple(h), %{state | stack: t}}
+        [h|t] -> {take(h), %{state | stack: t}}
         [] -> {nil, state}
       end
     end
@@ -49,7 +49,7 @@ defmodule Mix.ProjectStack do
   def peek do
     get fn %{stack: stack} ->
       case stack do
-        [h|_] -> project_to_tuple(h)
+        [h|_] -> take(h)
         [] -> nil
       end
     end
@@ -147,8 +147,8 @@ defmodule Mix.ProjectStack do
     end)
   end
 
-  defp project_to_tuple(%{name: name, config: config, file: file}) do
-    {name, config, file}
+  defp take(h) do
+    Map.take(h, [:name, :config, :file, :pos])
   end
 
   defp has_app?(%{config: config}) do

lib/mix/test/mix/project_test.exs

@@ -14,7 +14,7 @@ defmodule Mix.ProjectTest do
     Mix.Project.push(SampleProject, "sample")
     assert Mix.Project.get == SampleProject
 
-    assert {SampleProject, _config, "sample"} = Mix.Project.pop
+    assert %{name: SampleProject, config: _, file: "sample"} = Mix.Project.pop
     assert nil = Mix.Project.pop
   end
 
@@ -29,8 +29,8 @@ defmodule Mix.ProjectTest do
   test "allows nil projects to be pushed twice" do
     Mix.Project.push nil
     Mix.Project.push nil
-    assert is_tuple Mix.Project.pop
-    assert is_tuple Mix.Project.pop
+    assert is_map Mix.Project.pop
+    assert is_map Mix.Project.pop
     assert nil? Mix.Project.pop
   end
 

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

@@ -288,9 +288,9 @@ defmodule Mix.Tasks.DepsGitTest do
   end
 
   defp refresh(post_config) do
-    {current, _config, file} = Mix.Project.pop
+    %{name: name, file: file} = Mix.Project.pop
     Mix.ProjectStack.post_config(post_config)
-    Mix.Project.push(current, file)
+    Mix.Project.push(name, file)
   end
 
   defp get_git_repo_revs do

lib/mix/test/test_helper.exs

@@ -105,7 +105,7 @@ defmodule MixTest.Case do
     ensure_touched(file, File.stat!(file).mtime)
   end
 
-  defp ensure_touched(file, current) do
+  def ensure_touched(file, current) do
     File.touch!(file)
     unless File.stat!(file).mtime > current do
       ensure_touched(file, current)