Just a small change I did while debugging darcs-fast-export. (It didn't work
out in the end.)

Yours,
   Petr.

1 patch for repository http://darcs.net/:

Tue Jul 27 23:57:11 CEST 2010  Petr Rockai <me@mornfall.net>
  * Make the "error applying hunk" error a lot more readable (and useful).

Attachments

• make-the-_error-applying-hunk_-error-a-lot-more-readable-_and-useful__.dpatch
• unnamed

On Tue, Jul 27, 2010 at 21:56:34 +0000, Petr Ročkai wrote:
> Just a small change I did while debugging darcs-fast-export. (It didn't work
> out in the end.)

Applied, thanks!

Make the "error applying hunk" error a lot more readable (and useful).
----------------------------------------------------------------------
> -                 Nothing -> fail $ "Error applying hunk " ++
> +                 Nothing -> fail $ "### Error applying:\n" ++
>                                     (renderString $ showHunk NewFormat f line old new) ++
> hunk ./src/Darcs/Patch/Apply.lhs 186
> -                                   " to file " ++ fn2fp f ++ ": " ++ show ps
> +                                   "\n### to file " ++ fn2fp f ++ ":\n" ++ BC.unpack ps

This does seem like an improvement indeed, although we may want to be
careful about getting a kind of consistency in how we report things.

Note also that you may be able to use ColourPrinter to some effect;
I think the darcs-2 internal stuff uses red to mark some stuff up.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, please try +44 (0)1273 64 2905.

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-47fe619185670eb4caba9fe10e735a2c53d04ac9

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-47fe619185670eb4caba9fe10e735a2c53d04ac9