Sat Mar 26 10:16:58 PDT 2011 Duncan Coutts * Generalise the constraint set ADT in a couple ways We now track target packages and only require constraints on those targets to be satisfiable. This allows us to overconstrain packages that we do not care about, which is useful for excluding broken packages. We also now have a more general way of specifying constraints. Previously constraints were specified as the conjunction of a version range predicate and an optional installed constraint. This form made it impossible to express constraints such as "exclude this source package". Constraints for a package name are now specified simply by a function predicate on the package version and installed/source state. M ./Distribution/Client/Dependency/TopDown.hs -21 +27 M ./Distribution/Client/Dependency/TopDown/Constraints.hs -160 +445 M ./Distribution/Client/Dependency/TopDown/Types.hs -3 +4 M ./Distribution/Client/PackageIndex.hs -1 +10 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 07:57:56 PDT 2011 Duncan Coutts * Update the solver to use the new target tracking The constraint set ADT now needs to be told which targets we are interested in, rather than assuming anything we constrain might be a target. M ./Distribution/Client/Dependency/TopDown.hs -9 +40 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 08:37:49 PDT 2011 Duncan Coutts * Eliminate TaggedDependency type from solver code M ./Distribution/Client/Dependency/TopDown.hs -20 +21 M ./Distribution/Client/Dependency/TopDown/Types.hs -11 +4 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 09:40:48 PDT 2011 Duncan Coutts * Distinguish installed constraint error messages M ./Distribution/Client/Dependency/TopDown.hs -3 +13 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 10:57:33 PDT 2011 Duncan Coutts * Prune impossible packages as a solver pre-pass There are many packages that can never be successfully configured and by pruning them early we reduce the number of choices for the solver later (which is good since the solver does no backtracking when it makes bad choices). This relies on two recent features: 1. we can now express constraints that exclude a particular source package and 2. that we can exclude packages without needing to know whether or not they will ever be needed. M ./Distribution/Client/Dependency/TopDown.hs -9 +62 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 11:02:06 PDT 2011 Duncan Coutts * Log package exclusions due to top level constraints M ./Distribution/Client/Dependency/TopDown.hs -4 +5 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 11:02:52 PDT 2011 Duncan Coutts * Tweak to conflict constraint error message M ./Distribution/Client/Dependency/TopDown.hs -2 +2 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 15:37:43 PDT 2011 Duncan Coutts * Remove a module dependency to avoid cyclic imports M ./Distribution/Client/Fetch.hs -1 +3 M ./Distribution/Client/Install.hs -1 +3 M ./Distribution/Client/List.hs -1 +2 M ./Distribution/Client/Targets.hs -11 +5 M ./Distribution/Client/Unpack.hs -2 +4 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Sun Mar 27 16:52:54 PDT 2011 Duncan Coutts * Rename the constructors of PackageConstraint to be more consistent M ./Distribution/Client/Configure.hs -2 +2 M ./Distribution/Client/Dependency.hs -2 +2 M ./Distribution/Client/Dependency/TopDown.hs -4 +4 M ./Distribution/Client/Dependency/Types.hs -3 +3 M ./Distribution/Client/Install.hs -2 +2 M ./Distribution/Client/List.hs -1 +1 M ./Distribution/Client/Targets.hs -4 +4 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Tue Mar 29 02:57:10 PDT 2011 Duncan Coutts * Add support for source constraints to the solver M ./Distribution/Client/Dependency/TopDown.hs +23 M ./Distribution/Client/Dependency/TopDown/Types.hs -5 +8 M ./Distribution/Client/Dependency/Types.hs +1 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Thu Apr 14 13:47:29 PDT 2011 Duncan Coutts * Change the use of the InstalledConstraint type and enhance solver logging Now log when things get excluded due to installed and source constraints. M ./Distribution/Client/Dependency/TopDown.hs -59 +83 M ./Distribution/Client/Dependency/TopDown/Types.hs -2 +1 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit... Thu Apr 14 13:52:40 PDT 2011 Duncan Coutts * Add command line support for installed, source and flag constraints e.g. --constraint='foo source' --constraint='baz installed' --constraint='bar +this -that' M ./Distribution/Client/Configure.hs -2 +5 M ./Distribution/Client/Install.hs -2 +1 M ./Distribution/Client/Setup.hs -6 +20 M ./Distribution/Client/Targets.hs -9 +92 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal-install;a=darcs_commit...