7 patches manually rebased from Ben's encoding branch [1] 

This is not a strict rebase, since I already pushed parts of the first
patch "refactor text encoding" as 7 small patches [2], and removed some
comments hunks from "refactor text encoding" and the change in the help
of `darcs apply` that was unrelated.

Also in the patch "removed no longer needed iconv bindings" I added
hunks to remove iconv-related code from Setup.hs.

One patch I left out is "clean up display of file names by separating
display and storage of patches". Since with the current patches,all
tests pass, I think this last patch can come in a separate patch bundle.
(Also I haven't rebased it yet.)


[1] https://lists.osuosl.org/pipermail/darcs-devel/2017-May/018016.html
[2] http://bugs.darcs.net/patch1591

Attachments

• refactor-text-encoding-in-darcs.dpatch

Incidentally, cleaning unused imports makes it work with both Cabal 1.24
and 2.0.

Attachments

• fix-warnings-and-unused-imports-in-setup_hs.dpatch

I'm accepting this bundle. I cannot say for sure that it solves
everything in the best of all ways (eg the use of knob), but it works,
and simplifies a lot of things. Great job :D