Fetch new dependencies on mix deps.update, closes #7194

Author: José Valim

lib/mix/lib/mix/dep/fetcher.ex

@@ -36,8 +36,8 @@ defmodule Mix.Dep.Fetcher do
 
     fn %Mix.Dep{app: app} = dep, acc, new_lock ->
       # Only fetch if dependency is in given names or if lock has
-      # been changed for dependency by remote converger
-      if app in names or lock[app] != new_lock[app] do
+      # been changed for dependency by remote converger or it is new
+      if app in names or lock[app] != new_lock[app] or is_nil(lock[app]) do
         do_fetch(dep, acc, new_lock)
       else
         {dep, acc, new_lock}

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

@@ -64,7 +64,6 @@ defmodule Mix.Dep.Loader do
   """
   def load(%Mix.Dep{manager: manager, scm: scm, opts: opts} = dep, children) do
     manager = scm_manager(scm, opts) || manager || infer_manager(opts[:dest])
-
     dep = %{dep | manager: manager, status: scm_status(scm, opts)}
 
     {dep, children} =

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

@@ -231,7 +231,7 @@ defmodule Mix.Tasks.DepsGitTest do
     Mix.Project.push(GitApp)
 
     # Get Git repo first revision
-    [last, first | _] = get_git_repo_revs()
+    [last, first | _] = get_git_repo_revs("git_repo")
 
     in_fixture "no_mixfile", fn ->
       Mix.Dep.Lock.write(%{git_repo: {:git, fixture_path("git_repo"), first, []}})
@@ -257,7 +257,7 @@ defmodule Mix.Tasks.DepsGitTest do
 
   test "updates the repo when the lock updates" do
     Mix.Project.push(GitApp)
-    [last, first | _] = get_git_repo_revs()
+    [last, first | _] = get_git_repo_revs("git_repo")
 
     in_fixture "no_mixfile", fn ->
       Mix.Dep.Lock.write(%{git_repo: {:git, fixture_path("git_repo"), first, []}})
@@ -349,7 +349,7 @@ defmodule Mix.Tasks.DepsGitTest do
 
   test "updates the repo and the lock when the mixfile updates" do
     Mix.Project.push(GitApp)
-    [last, first | _] = get_git_repo_revs()
+    [last, first | _] = get_git_repo_revs("git_repo")
 
     in_fixture "no_mixfile", fn ->
       # Move to the first version
@@ -382,6 +382,32 @@ defmodule Mix.Tasks.DepsGitTest do
     purge([GitRepo, GitRepo.MixProject])
   end
 
+  test "fetches children on updates" do
+    Mix.Project.push(DepsOnGitApp)
+
+    # Get Git repo first revision
+    [last, first | _] = get_git_repo_revs("deps_on_git_repo")
+
+    in_fixture "no_mixfile", fn ->
+      Mix.Dep.Lock.write(%{deps_on_git_repo: {:git, fixture_path("deps_on_git_repo"), first, []}})
+
+      Mix.Tasks.Deps.Get.run([])
+      assert File.exists?("deps/deps_on_git_repo/mix.exs")
+      refute File.exists?("deps/git_repo/lib/git_repo.ex")
+      assert File.read!("mix.lock") =~ first
+
+      Mix.Task.clear()
+      Mix.ProjectStack.clear_cache()
+      purge([DepsOnGitRepo.MixProject])
+
+      Mix.Tasks.Deps.Update.run(["deps_on_git_repo"])
+      assert File.exists?("deps/git_repo/lib/git_repo.ex")
+      assert File.read!("mix.lock") =~ last
+    end
+  after
+    purge([GitRepo, GitRepo.MixProject])
+  end
+
   test "does not attempt to compile projects that could not be retrieved" do
     Mix.Project.push(GitErrorApp)
 
@@ -394,7 +420,7 @@ defmodule Mix.Tasks.DepsGitTest do
 
   test "does not load bad mixfiles on get" do
     Mix.Project.push(GitApp)
-    [last, _, bad | _] = get_git_repo_revs()
+    [last, _, bad | _] = get_git_repo_revs("git_repo")
 
     in_fixture "no_mixfile", fn ->
       Mix.Dep.Lock.write(%{git_repo: {:git, fixture_path("git_repo"), bad, []}})
@@ -428,7 +454,7 @@ defmodule Mix.Tasks.DepsGitTest do
 
   test "does not load bad mixfiles on update" do
     Mix.Project.push(GitApp)
-    [last, _, bad | _] = get_git_repo_revs()
+    [last, _, bad | _] = get_git_repo_revs("git_repo")
 
     in_fixture "no_mixfile", fn ->
       Mix.Dep.Lock.write(%{git_repo: {:git, fixture_path("git_repo"), bad, []}})
@@ -448,8 +474,8 @@ defmodule Mix.Tasks.DepsGitTest do
     Mix.Project.push(name, file)
   end
 
-  defp get_git_repo_revs() do
-    File.cd!(fixture_path("git_repo"), fn ->
+  defp get_git_repo_revs(repo) do
+    File.cd!(fixture_path(repo), fn ->
       Regex.split(~r(\r?\n), System.cmd("git", ["log", "--format=%H"]) |> elem(0))
     end)
   end

lib/mix/test/test_helper.exs

@@ -280,6 +280,28 @@ target = Path.expand("fixtures/deps_on_git_repo", __DIR__)
 unless File.dir?(target) do
   File.mkdir_p!(Path.join(target, "lib"))
 
+  File.write!(Path.join(target, "mix.exs"), """
+  ## Auto-generated fixture
+  defmodule DepsOnGitRepo.MixProject do
+    use Mix.Project
+
+    def project do
+      [
+        app: :deps_on_git_repo,
+        version: "0.1.0",
+      ]
+    end
+  end
+  """)
+
+  File.cd!(target, fn ->
+    System.cmd("git", ~w[init])
+    System.cmd("git", ~w[config user.email "[email protected]"])
+    System.cmd("git", ~w[config user.name "mix-repo"])
+    System.cmd("git", ~w[add .])
+    System.cmd("git", ~w[commit -m without-dep])
+  end)
+
   File.write!(Path.join(target, "mix.exs"), """
   ## Auto-generated fixture
   defmodule DepsOnGitRepo.MixProject do
@@ -303,11 +325,8 @@ unless File.dir?(target) do
   """)
 
   File.cd!(target, fn ->
-    System.cmd("git", ~w[init])
-    System.cmd("git", ~w[config user.email "[email protected]"])
-    System.cmd("git", ~w[config user.name "mix-repo"])
     System.cmd("git", ~w[add .])
-    System.cmd("git", ~w[commit -m "ok"])
+    System.cmd("git", ~w[commit -m with-dep])
   end)
 end