aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/resolver.rb
Commit message (Expand)AuthorAgeFilesLines
* Revert "Performance: lazily memoize expensive `prerelease?` values during res...Andre Arko2014-10-201-2/+1
* Performance: lazily memoize expensive `prerelease?` values during resolveDov Murik2014-10-201-1/+2
* Improved the performance by avoid a O(n) lookup in statesSmit Shah2014-06-151-1/+1
* Fixed #2994 regression with the resolverSmit Shah2014-06-151-9/+14
* Adding condition to ensure current is not nilSmit Shah2014-02-131-1/+1
* Debug resolver once the find_conflict is doneSmit Shah2014-02-121-5/+2
* Fix some typos in lib/Jake Worth2014-01-251-4/+4
* Fixed #2833 issue with Bundler resolverSmit Shah2014-01-231-14/+26
* Optimised the performance of resolver for certain GemfilesSmit Shah2014-01-131-4/+5
* Resolver now follows existing gem required_by tree to resolve conflictsSmit Shah2014-01-121-3/+2
* Resolver now looks exiting gem parent to resolve more effectivelySmit Shah2014-01-111-2/+6
* Fixed the failing spec in Ruby 1.8.7Smit Shah2014-01-101-3/+1
* Improved resolver significantly by trimming the search spaceSmit Shah2014-01-101-14/+7
* Check if parent is not nilSmit Shah2013-12-251-1/+1
* Fixed an issue where resolving the conflict could lead to a loopSmit Shah2013-12-251-3/+8
* Fixed a failing spec because of DEBUG_RESOLVER_TREESmit Shah2013-12-231-8/+12
* Merge pull request #2726 from Who828/masterAndre Arko2013-12-231-200/+167
|\
| * Don't add into states if no version of the gem is foundSmit Shah2013-12-021-2/+2
| * Rename the method to dependency_tree instead of print_dependency_treeSmit Shah2013-11-271-2/+2
| * Print out the depedency tree in case of version_conflict in a child dependencySmit Shah2013-11-271-6/+20
| * Refactored duplicate code by puting it into a methodSmit Shah2013-11-221-41/+28
| * Delegate the responsiblity of raising version_conflict error to resolve_for_c...Smit Shah2013-11-221-7/+1
| * Added a fix to raise version_conflict if a children dependency is not resolvedSmit Shah2013-11-221-1/+6
| * Added comments for better understanding few of the methodsSmit Shah2013-11-221-0/+25
| * Removed uneeded codeSmit Shah2013-11-221-232/+2
| * Added debug statementsSmit Shah2013-11-221-3/+32
| * Added a fix to handle when no state are found for the current parentSmit Shah2013-11-221-1/+1
| * Added a fix to handle conflict on a child with specsSmit Shah2013-11-221-3/+2
| * Added a fix for multiple level conflict resolutionSmit Shah2013-11-221-10/+23
| * Fixed a bug where backtracking didn't work correctlySmit Shah2013-11-211-0/+2
| * If no version is found for the current gem and its not a root level requireme...Smit Shah2013-11-211-0/+4
| * Handled Cyclic dependcies errors correctlySmit Shah2013-11-211-2/+3
| * [WIP] Iterative algorithm for bundler resolveSmit Shah2013-11-211-6/+144
* | restore dep error indentationAndre Arko2013-12-121-4/+3
* | Rename the method to dependency_tree instead of print_dependency_treeSmit Shah2013-12-101-2/+2
* | Print out the depedency tree in case of version_conflict in a child dependencySmit Shah2013-12-101-6/+20
|/
* Merge pull request #2510 from headius/stack_friendly_recursionAndre Arko2013-07-031-6/+10
|\
| * Add and use a new catch/throw mechanism that's stack-friendly.Charles Oliver Nutter2013-06-231-6/+10
* | Merge pull request #2249 from dblock/debug-resolver-treeAndre Arko2013-07-031-5/+7
|\ \ | |/ |/|
| * Add ENV[DEBUG_RESOLVER_TREE] which outputs the resolver tree when bundle inst...dblock2013-01-141-5/+7
* | fix newlines around resolver progressAndre Arko2013-04-031-1/+5
* | Add indicator progress in resolver Giorgos Tsiftsis2013-03-241-6/+23
* | Merge pull request #2326 from softace/verbose_resolverAndre Arko2013-02-241-0/+6
|\ \
| * | Added dots for activityJarl Friis2013-02-211-0/+6
* | | minor rename to remove variable shadowing warningPiotr Szotkowski2013-02-241-4/+4
|/ /
* | Merge branch '1-2-stable'Andre Arko2013-02-121-0/+1
|\ \
| * | inform users when resolver startsAndre Arko2013-02-121-0/+1
| |/
* | Fix conflict resolution optimizationMichael Rykov2013-02-101-6/+13
* | Skip unnecessary attempts when resolving conflictsMichael Rykov2013-02-081-0/+9
|/
* only clear search cache on conflictosheroff2012-02-171-3/+4