Merge pull request #2170 from ericmj/mix-unloaded-name

Fetch if remote converger updated dependency lock

Author: ericmj

lib/mix/lib/mix/dep.ex

@@ -111,27 +111,6 @@ defmodule Mix.Dep do
     { Mix.Dep.Converger.topsort(deps), acc, lock }
   end
 
-  @doc """
-  Receives a list of dependency names and maps and reduces over
-  them. See `unloaded`.
-
-  ## Exceptions
-
-  This function raises an exception if any of the dependencies
-  provided in the project are in the wrong format.
-  """
-  def unloaded_by_name(given, acc, lock, opts, callback) do
-    names = to_app_names(given)
-
-    unloaded(acc, lock, opts, fn dep, acc, lock ->
-      if dep.app in names do
-        callback.(dep, acc, lock)
-      else
-        { dep, acc, lock }
-      end
-    end)
-  end
-
   @doc """
   Runs the given `fun` inside the given dependency project by
   changing the current working directory and loading the given

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

@@ -26,12 +26,29 @@ defmodule Mix.Dep.Fetcher do
   See `Mix.Dep.unloaded_by_name/4` for options.
   """
   def by_name(names, old_lock, new_lock, opts) do
-    result = Mix.Dep.unloaded_by_name(names, [], new_lock, opts, &do_fetch/3)
+    fetcher = fetch_by_name(names, new_lock)
+    result = Mix.Dep.unloaded([], new_lock, opts, fetcher)
     { apps, deps } = do_finalize(result, old_lock, opts)
-    Mix.Dep.loaded_by_name(names, deps, opts) # Check all given dependencies are loaded or fail
+
+    # Check if all given dependencies are loaded or fail
+    Mix.Dep.loaded_by_name(names, deps, opts)
     apps
   end
 
+  defp fetch_by_name(given, lock) do
+    names = to_app_names(given)
+
+    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
+        do_fetch(dep, acc, new_lock)
+      else
+        { dep, acc, new_lock }
+      end
+    end
+  end
+
   defp do_fetch(dep, acc, lock) do
     %Mix.Dep{app: app, scm: scm, opts: opts} = dep = check_lock(dep, lock)
 
@@ -123,4 +140,10 @@ defmodule Mix.Dep.Fetcher do
 
     do_with_depending(parents, all_deps) ++ parents
   end
+
+  defp to_app_names(given) do
+    Enum.map(given, fn(app) ->
+      if is_binary(app), do: binary_to_atom(app), else: app
+    end)
+  end
 end