The existing approach has been to parse top level fields and then
separately parse each top level section, and similarly for pretty
printing. A better approach is to follow the pattern for fields and have
a section description. Then we just parse or print fields+sections in
one call. And as a bonus, secitons can have subsections (and could even
do so recursively).

This patch just adds the new functionality. No existing config parsing
is switched over.

withRepoContext keeps its current type (using GlobalFlags). Added
withRepoContext' that takes all the args seprately. Better name
suggestions welcome.

Getters and setters really need to match up.

Detected by parse/print round trip QC tests.

Fix ConfigStateFileError messages

The error messages associated with ConfigStateFileError have been
reformatted and reworded for clarity.

Fixes #3157. The wrapText helper is used to format all error
messages. Previously, it was only used to format IOException errors;
other exceptions would be formatted incorrectly.

Exporting the default rendering style allows us to consistently format
text without needing to write a Text instance.

Don't use './Setup' for building 'cabal-install'.

Fixes #3214.

(cherry picked from commit 9accafeb)

gershomb authored 9 years ago and Mikhail Glushenkov committed 9 years ago

The flag enable-executable-profiling warns to change it to just enable-profiling. So we'll fix that here too so we don't send people down an old path.
(cherry picked from commit c69dfb82)

Herbert Valerio Riedel authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit b45ecc82)

Herbert Valerio Riedel authored 9 years ago and Mikhail Glushenkov committed 9 years ago

Currently GHC 8.0 has a slightly different error message if it can't
find a `.hi` file. It's not clear yet if and how we're going to change the
message before GHC 8.0 final.

(cherry picked from commit 9c7131a7)

Herbert Valerio Riedel authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit b3456767)

(cherry picked from commit fc00e33c)

kristenk authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit e0cd3027)

[ci skip]

(cherry picked from commit 4018b837)

Andres Löh authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit 2854bcb3)

kristenk authored 9 years ago and Mikhail Glushenkov committed 9 years ago

This commit removes references to the solver log that prevented it from being
garbage collected.  It also forces evaluation of the current level and variable
stack in 'Message.showMessages'.

(cherry picked from commit 37f28f23)

(cherry picked from commit d137c93e)

Andres Löh authored 9 years ago and Mikhail Glushenkov committed 9 years ago

Previously, a setting of `--max-backjumps=-1` was reported in
the debug output as `0`. But `0` has a very different meaning,
and that is confusing.

(cherry picked from commit 8614859d)

[ci skip]

(cherry picked from commit 28b08d6b)

Andres Löh authored 9 years ago and Mikhail Glushenkov committed 9 years ago

This change primarily does two things:

1. For `--reorder-goals`, we use a dedicated datatype `Degree`
   rather than an `Int` to compute the approximate branching
   degree. We map 0 and 1 to the same value. We then use a
   lazy ordering and a shortcutting minimum function to look
   for the "best" goal.

   The motivation here is that we do not want to spend
   unnecessary work. Following any goal that has 0 or 1 as degree
   cannot really be "wrong", so we should not look at any others
   and waste time.

   This will still not always make the use of `--reorder-goals`
   better than not using it, but it will reduce the overhead
   introduced by it.

2. We use partitioning rather than sorting for most of the other
   goal reordering heuristics that are active in all situations.
   I think this is slightly more straightforward and also slightly
   more efficient, whether `--reorder-goals` is used or not.

I have run some preliminary performance comparisons and they
seem to confirm that in both cases separately (with or without
`--reorder-goals`), these changes are a relative improvement
over the status quo. I will run additional tests before
merging this into master.

(cherry picked from commit 150d6ca9)

Herbert Valerio Riedel authored 9 years ago and Mikhail Glushenkov committed 9 years ago

In GHC 8.0 -Wall implies -Wredundant-constraints, so we have to
address those warings in one way or another.

(cherry picked from commit fa8364f6)

Herbert Valerio Riedel authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit 880ad15e)

(cherry picked from commit 28e4d38a)

[ci skip]

Andres Löh authored 9 years ago and Mikhail Glushenkov committed 9 years ago

A number of small changes:

- Some comment typos fixed.
- The main function for cycle detection is now called
  `cycleDetectionPhase`, in analogy with all the other
  phases.

I've run a superficial performance test trying to install
all of Hackage on a clean db with ghc-7.10.3. This is not
likely to trigger any situations where cycle detection
actually kicks in, but it confirms in general that there is
no negative performance (or correctness) impact for the
common case.

I've also considered moving the cycle detection phase to
"earlier" in the solver, but after performance testing, decided
against it, and documented the decision and the reasons in
the code.

(cherry picked from commit 64a014ec)

Edsko de Vries authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit a0a80420)

Edsko de Vries authored 9 years ago and Mikhail Glushenkov committed 9 years ago

and fix bug in qualityDeps

(cherry picked from commit 927ec763)

kristenk authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit b36f0a44)

kristenk authored 9 years ago and Mikhail Glushenkov committed 9 years ago

(cherry picked from commit d75e4ab1)

kristenk authored 9 years ago and Mikhail Glushenkov committed 9 years ago

Fixes #3059.

cabal's handling of non-existent sources depends on the behavior of the
directory package. 'canonicalizePath' can fail on non-existent paths before
directory-1.2.3.0. This commit updates the test 'fail_on_nonexistent_source' to
allow 'cabal sandbox delete-source' to fail or succeed.  It also changes
'fail_removing_source_thats_not_registered' so that it only tests existing
sources.

(cherry picked from commit 4a06b1d4)

(cherry picked from commit 05dccd62)

See https://github.com/haskell/cabal/issues/3198#issuecomment-190978842.

(cherry picked from commit f78ba4bb)

See https://github.com/haskell/cabal/pull/3197#issuecomment-189839042.

(cherry picked from commit d3d781b5)

(cherry picked from commit 3f0e75da)