Auto merge of #5101 - bundler:seg-resolver-consider-locked-deps-first, r=indirect

[Resolver] Consider locked dependencies first

Closes https://github.com/bundler/bundler/issues/5031
Closes #5095

\c @marcandre @indirect

2 files changed, 139 insertions, 2 deletions

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index bdb8f4883c..2eff76d7ff 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -14,7 +14,7 @@ module Bundler
 
       def message
         conflicts.sort.reduce(String.new) do |o, (name, conflict)|
-          o << %(Bundler could not find compatible versions for gem "#{name}":\n)
+          o << %(\nBundler could not find compatible versions for gem "#{name}":\n)
           if conflict.locked_requirement
             o << %(  In snapshot (#{Bundler.default_lockfile.basename}):\n)
             o << %(    #{printable_dep(conflict.locked_requirement)}\n)
@@ -62,7 +62,7 @@ module Bundler
             end
           end
           o
-        end
+        end.strip
       end
     end
 
@@ -315,6 +315,7 @@ module Bundler
       dependencies.sort_by do |dependency|
         name = name_for(dependency)
         [
+          @base_dg.vertex_named(name) ? 0 : 1,
           activated.vertex_named(name).payload ? 0 : 1,
           amount_constrained(dependency),
           conflicts[name] ? 0 : 1,
diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index 81fe3d77b0..966707449d 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -94,6 +94,142 @@ describe "real world edgecases", :realworld => true, :sometimes => true do
     expect(lockfile).to include(rubygems_version("activesupport", "~> 3.0"))
   end
 
+  it "is able to update a top-level dependency when there is a conflict on a shared transitive child", :ruby => "2.1" do
+    # from https://github.com/bundler/bundler/issues/5031
+
+    gemfile <<-G
+      source "https://rubygems.org"
+      gem 'rails', '~> 4.2.7.1'
+      gem 'paperclip', '~> 5.1.0'
+    G
+
+    lockfile <<-L
+      GEM
+        remote: https://rubygems.org/
+        specs:
+          actionmailer (4.2.7.1)
+            actionpack (= 4.2.7.1)
+            actionview (= 4.2.7.1)
+            activejob (= 4.2.7.1)
+            mail (~> 2.5, >= 2.5.4)
+            rails-dom-testing (~> 1.0, >= 1.0.5)
+          actionpack (4.2.7.1)
+            actionview (= 4.2.7.1)
+            activesupport (= 4.2.7.1)
+            rack (~> 1.6)
+            rack-test (~> 0.6.2)
+            rails-dom-testing (~> 1.0, >= 1.0.5)
+            rails-html-sanitizer (~> 1.0, >= 1.0.2)
+          actionview (4.2.7.1)
+            activesupport (= 4.2.7.1)
+            builder (~> 3.1)
+            erubis (~> 2.7.0)
+            rails-dom-testing (~> 1.0, >= 1.0.5)
+            rails-html-sanitizer (~> 1.0, >= 1.0.2)
+          activejob (4.2.7.1)
+            activesupport (= 4.2.7.1)
+            globalid (>= 0.3.0)
+          activemodel (4.2.7.1)
+            activesupport (= 4.2.7.1)
+            builder (~> 3.1)
+          activerecord (4.2.7.1)
+            activemodel (= 4.2.7.1)
+            activesupport (= 4.2.7.1)
+            arel (~> 6.0)
+          activesupport (4.2.7.1)
+            i18n (~> 0.7)
+            json (~> 1.7, >= 1.7.7)
+            minitest (~> 5.1)
+            thread_safe (~> 0.3, >= 0.3.4)
+            tzinfo (~> 1.1)
+          arel (6.0.3)
+          builder (3.2.2)
+          climate_control (0.0.3)
+            activesupport (>= 3.0)
+          cocaine (0.5.8)
+            climate_control (>= 0.0.3, < 1.0)
+          concurrent-ruby (1.0.2)
+          erubis (2.7.0)
+          globalid (0.3.7)
+            activesupport (>= 4.1.0)
+          i18n (0.7.0)
+          json (1.8.3)
+          loofah (2.0.3)
+            nokogiri (>= 1.5.9)
+          mail (2.6.4)
+            mime-types (>= 1.16, < 4)
+          mime-types (3.1)
+            mime-types-data (~> 3.2015)
+          mime-types-data (3.2016.0521)
+          mimemagic (0.3.2)
+          mini_portile2 (2.1.0)
+          minitest (5.9.1)
+          nokogiri (1.6.8)
+            mini_portile2 (~> 2.1.0)
+            pkg-config (~> 1.1.7)
+          paperclip (5.1.0)
+            activemodel (>= 4.2.0)
+            activesupport (>= 4.2.0)
+            cocaine (~> 0.5.5)
+            mime-types
+            mimemagic (~> 0.3.0)
+          pkg-config (1.1.7)
+          rack (1.6.4)
+          rack-test (0.6.3)
+            rack (>= 1.0)
+          rails (4.2.7.1)
+            actionmailer (= 4.2.7.1)
+            actionpack (= 4.2.7.1)
+            actionview (= 4.2.7.1)
+            activejob (= 4.2.7.1)
+            activemodel (= 4.2.7.1)
+            activerecord (= 4.2.7.1)
+            activesupport (= 4.2.7.1)
+            bundler (>= 1.3.0, < 2.0)
+            railties (= 4.2.7.1)
+            sprockets-rails
+          rails-deprecated_sanitizer (1.0.3)
+            activesupport (>= 4.2.0.alpha)
+          rails-dom-testing (1.0.7)
+            activesupport (>= 4.2.0.beta, < 5.0)
+            nokogiri (~> 1.6.0)
+            rails-deprecated_sanitizer (>= 1.0.1)
+          rails-html-sanitizer (1.0.3)
+            loofah (~> 2.0)
+          railties (4.2.7.1)
+            actionpack (= 4.2.7.1)
+            activesupport (= 4.2.7.1)
+            rake (>= 0.8.7)
+            thor (>= 0.18.1, < 2.0)
+          rake (11.3.0)
+          sprockets (3.7.0)
+            concurrent-ruby (~> 1.0)
+            rack (> 1, < 3)
+          sprockets-rails (3.2.0)
+            actionpack (>= 4.0)
+            activesupport (>= 4.0)
+            sprockets (>= 3.0.0)
+          thor (0.19.1)
+          thread_safe (0.3.5)
+          tzinfo (1.2.2)
+            thread_safe (~> 0.1)
+
+      PLATFORMS
+        ruby
+
+      DEPENDENCIES
+        paperclip (~> 5.1.0)
+        rails (~> 4.2.7.1)
+
+      BUNDLED WITH
+         1.13.1
+    L
+
+    bundle! "lock --update paperclip"
+
+    expect(lockfile).to include(rubygems_version("paperclip", "~> 5.1.0"))
+  end
+
   # https://github.com/bundler/bundler/issues/1500
   it "does not fail install because of gem plugins" do
     realworld_system_gems("open_gem --version 1.4.2", "rake --version 0.9.2")