Remote converger should receive full dep struct

Author: ericmj

lib/mix/lib/mix/dep/converger.ex

@@ -54,7 +54,7 @@ defmodule Mix.Dep.Converger do
       all(main, [], [], apps, callback, rest, fn dep ->
         if not nil?(rest) &&
            converger &&
-           converger.remote?(dep.app) do
+           converger.remote?(dep) do
           { :loaded, dep }
         else
           { :unloaded, dep }
@@ -70,7 +70,7 @@ defmodule Mix.Dep.Converger do
         converged_deps = converger.converge(deps)
                          |> Enum.into(HashDict.new, to_dict)
         deps = deps
-               |> Enum.reject(&converger.remote?(&1.app))
+               |> Enum.reject(&converger.remote?(&1))
                |> Enum.into(HashDict.new, to_dict)
 
         all(main, [], [], apps, callback, rest, fn dep ->

lib/mix/lib/mix/remote_converger.ex

@@ -7,10 +7,10 @@ defmodule Mix.RemoteConverger do
   # Useful for things like external package managers
 
   @doc """
-  Return `true` if given dependency app name handled by
+  Return `true` if given dependency is handled by
   remote converger.
   """
-  defcallback remote?(atom) :: boolean
+  defcallback remote?(Mix.Dep.t) :: boolean
 
   @doc """
   Run the remote converger.

lib/mix/lib/mix/scm.ex

@@ -118,13 +118,15 @@ defmodule Mix.SCM do
   Prepend the given SCM module to the list of available SCMs.
   """
   def prepend(mod) when is_atom(mod) do
+    available = Enum.reject(available(), &(&1 == mod))
     :application.set_env(:mix, :scm, [mod|available])
   end
 
   @doc """
   Aopend the given SCM module to the list of available SCMs.
   """
   def append(mod) when is_atom(mod) do
+    available = Enum.reject(available(), &(&1 == mod))
     :application.set_env(:mix, :scm, available ++ [mod])
   end
 end